Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,19 @@ stdenv.mkDerivation (finalAttrs: {
];

qtWrapperArgs = lib.optionals (stdenv.hostPlatform.isLinux && withWebkit) [
"--prefix"
"LD_LIBRARY_PATH"
":"
(lib.makeLibraryPath [
geoclue2
webkitgtk_4_1
])
[
"--prefix"
"LD_LIBRARY_PATH"
":"
(lib.makeLibraryPath [
geoclue2
webkitgtk_4_1
])
]
];

__structuredAttrs = true;

dontUnpack = true;
dontWrapGApps = true;
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
Expand Down
1 change: 0 additions & 1 deletion pkgs/by-name/_0/_010editor/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: {

sourceRoot = ".";

strictDeps = true;
dontBuild = true;
dontConfigure = true;

Expand Down
2 changes: 0 additions & 2 deletions pkgs/by-name/_0/_0xffff/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-RTpiH6OpC1hRbhLW5Em01oDQdpAZ/mfggCDLSUzOC9s=";
};

strictDeps = true;

buildInputs = [ libusb-compat-0_1 ];

installFlags = [
Expand Down
10 changes: 5 additions & 5 deletions pkgs/by-name/_0/_0xpropo/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "0xpropo";
version = "1.100";

src =
let
underscoreVersion = builtins.replaceStrings [ "." ] [ "_" ] version;
underscoreVersion = builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version;
in
fetchzip {
url = "https://github.com/0xType/0xPropo/releases/download/${version}/0xPropo_${underscoreVersion}.zip";
url = "https://github.com/0xType/0xPropo/releases/download/${finalAttrs.version}/0xPropo_${underscoreVersion}.zip";
hash = "sha256-ZlZNvn9xiOxS+dfGI1rGbh6XlXo3/puAm2vhKh63sK4=";
};

Expand All @@ -26,9 +26,9 @@ stdenvNoCC.mkDerivation rec {
meta = {
description = "Proportional version of the 0xProto font";
homepage = "https://github.com/0xType/0xPropo";
changelog = "https://github.com/0xType/0xPropo/releases/tag/${version}";
changelog = "https://github.com/0xType/0xPropo/releases/tag/${finalAttrs.version}";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ vinnymeller ];
platforms = lib.platforms.all;
};
}
})
8 changes: 4 additions & 4 deletions pkgs/by-name/_0/_0xproto/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
fetchzip,
nix-update-script,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "0xproto";
version = "2.502";

src =
let
underscoreVersion = builtins.replaceStrings [ "." ] [ "_" ] version;
underscoreVersion = builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version;
in
fetchzip {
url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip";
url = "https://github.com/0xType/0xProto/releases/download/${finalAttrs.version}/0xProto_${underscoreVersion}.zip";
hash = "sha256-ffYvfEGMoIJKVEcs2XzhDrq++SkTbQOVvb6X9q+uyu8=";
stripRoot = false;
};
Expand All @@ -38,4 +38,4 @@ stdenvNoCC.mkDerivation rec {
maintainers = with lib.maintainers; [ edswordsmith ];
platforms = lib.platforms.all;
};
}
})
7 changes: 3 additions & 4 deletions pkgs/by-name/_1/_1fps/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
libxtst,
libxi,
libx11,
stdenv,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "1fps";
version = "0.1.17";

src = fetchFromGitHub {
owner = "1fpsvideo";
repo = "1fps";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-8dtcW/niwmhVXB2kZdR/RjNg2ArSClL1w4nGI5rP3+Y=";
};

Expand All @@ -35,4 +34,4 @@ buildGoModule rec {
maintainers = with lib.maintainers; [ renesat ];
mainProgram = "1fps";
};
}
})
3 changes: 0 additions & 3 deletions pkgs/by-name/_1/_1oom/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
readline
];

strictDeps = true;
enableParallelBuilding = true;

postInstall = ''
install -d $doc/share/doc/1oom
install -t $doc/share/doc/1oom \
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/_1/_1password-cli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stdenv.mkDerivation {
versionCheckHook
]
++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
++ lib.optional stdenv.hostPlatform.isDarwin [
++ lib.optionals stdenv.hostPlatform.isDarwin [
xar
cpio
];
Expand Down
10 changes: 4 additions & 6 deletions pkgs/by-name/_2/_2048-in-terminal/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,30 @@
pkg-config,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "2048-in-terminal";
version = "0-unstable-2022-06-13";

src = fetchFromGitHub {
owner = "alewmoose";
repo = "2048-in-terminal";
rev = "bf22f868a2e0e572f22153468585ec0226a4b8b2";
sha256 = "sha256-Y5ZQYWOiG3QZZsr+d7olUDGAQ1LhRG9X2hBNQDx+Ztw=";
hash = "sha256-Y5ZQYWOiG3QZZsr+d7olUDGAQ1LhRG9X2hBNQDx+Ztw=";
};

buildInputs = [ ncurses ];
nativeBuildInputs = [ pkg-config ];

enableParallelBuilding = true;

preInstall = ''
mkdir -p $out/bin
'';
installFlags = [ "PREFIX=$(out)" ];

meta = {
inherit (src.meta) homepage;
inherit (finalAttrs.src.meta) homepage;
description = "Animated console version of the 2048 game";
mainProgram = "2048-in-terminal";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
}
})
10 changes: 5 additions & 5 deletions pkgs/by-name/_2/_20kly/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
python3Packages,
}:

python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
pname = "20kly";
version = "1.5.0";

Expand All @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "20kly";
repo = "20kly";
tag = "v${version}";
sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
tag = "v${finalAttrs.version}";
hash = "sha256-Hd674RtYHwDZLjTz5IIFewOlqphvjt7iP1MAlcjruv8=";
};

patchPhase = ''
substituteInPlace lightyears \
--replace \
--replace-fail \
"LIGHTYEARS_DIR = \".\"" \
"LIGHTYEARS_DIR = \"$out/share\""
'';
Expand All @@ -45,4 +45,4 @@ python3Packages.buildPythonApplication rec {
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ fgaz ];
};
}
})
2 changes: 0 additions & 2 deletions pkgs/by-name/_2/_2ship2harkinian/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "OPUSFILE_INCLUDE_DIR" "${lib.getDev opusfile}/include/opus")
];

strictDeps = true;

dontAddPrefix = true;

# Linking fails without this
Expand Down
10 changes: 5 additions & 5 deletions pkgs/by-name/_3/_3270font/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
fetchzip,
}:

stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "3270font";
version = "3.0.1";

src = fetchzip {
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_d916271.zip";
sha256 = "sha256-Zi6Lp5+sqfjIaHmnaaemaw3i+hXq9mqIsK/81lTkwfM=";
url = "https://github.com/rbanffy/3270font/releases/download/v${finalAttrs.version}/3270_fonts_d916271.zip";
hash = "sha256-Zi6Lp5+sqfjIaHmnaaemaw3i+hXq9mqIsK/81lTkwfM=";
stripRoot = false;
};

Expand All @@ -32,12 +32,12 @@ stdenvNoCC.mkDerivation rec {
meta = {
description = "Monospaced font based on IBM 3270 terminals";
homepage = "https://github.com/rbanffy/3270font";
changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/rbanffy/3270font/blob/v${finalAttrs.version}/CHANGELOG.md";
license = [
lib.licenses.bsd3
lib.licenses.ofl
];
maintainers = [ ];
platforms = lib.platforms.all;
};
}
})
13 changes: 7 additions & 6 deletions pkgs/by-name/_3/_389-ds-base/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
cargo
rustc
]
++ lib.optional withCockpit rsync;
++ lib.optional withCockpit rsync
++ lib.optional withNetSnmp net-snmp;

buildInputs = [
cracklib
Expand All @@ -95,8 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional withSystemd systemd
++ lib.optional withOpenldap openldap
++ lib.optional withBdb db
++ lib.optional withNetSnmp net-snmp;
++ lib.optional withBdb db;

postPatch = ''
patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py
Expand All @@ -119,7 +119,9 @@ stdenv.mkDerivation (finalAttrs: {
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
]
++ lib.optionals withOpenldap [
"--with-openldap"
"--with-openldap-inc=${lib.getDev openldap}/include"
"--with-openldap-lib=${lib.getLib openldap}/lib"
"--with-openldap-bin=${openldap}/bin"
]
++ lib.optionals withBdb [
"--with-db-inc=${lib.getDev db}/include"
Expand All @@ -137,8 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-debug"
];

enableParallelBuilding = true;
# Disable parallel builds as those lack some dependencies:
# Disable parallel installation as those lack some dependencies:
# ld: cannot find -lslapd: No such file or directory
# https://hydra.nixos.org/log/h38bj77gav0r6jbi4bgzy1lfjq22k2wy-389-ds-base-2.3.1.drv
enableParallelInstalling = false;
Expand Down
8 changes: 3 additions & 5 deletions pkgs/by-name/_3/_3cpio/package.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{
fetchFromGitHub,
lib,
lz4,
lzop,
nix-update-script,
rustPlatform,
stdenv,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "3cpio";
version = "0.13.0";

src = fetchFromGitHub {
owner = "bdrung";
repo = "3cpio";
tag = version;
tag = finalAttrs.version;
hash = "sha256-4ERSH5Kz/e2MuIIgi3XQVnhW0csBPDIvdmEw05OdREA=";
};

Expand All @@ -36,4 +34,4 @@ rustPlatform.buildRustPackage rec {
# https://github.com/rust-lang/libc/issues/4360
broken = stdenv.hostPlatform.isDarwin;
};
}
})
8 changes: 4 additions & 4 deletions pkgs/by-name/_3/_3mux/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
makeWrapper,
}:

buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "3mux";
version = "1.1.0";

src = fetchFromGitHub {
owner = "aaronjanse";
repo = "3mux";
tag = "v${version}";
sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
tag = "v${finalAttrs.version}";
hash = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
};

patches = [
Expand Down Expand Up @@ -64,4 +64,4 @@ buildGoModule rec {
];
platforms = lib.platforms.unix;
};
}
})
Loading
Loading