alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: noop: replace every newly introduced stdenv.mkDerivation rec with a fixpoint over finalAttrs

Browse source
This commit is contained in:
Jan Malakhovski 2023-08-02 13:09:30 +00:00
parent 775f21b9fd
commit a0a909fa9e
11 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/emulators/basiliskii/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "basiliskii";
version = "unstable-2022-09-30";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af";
sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM=";
};
sourceRoot = "${src.name}/BasiliskII/src/Unix";
sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix";
patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ];
nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ SDL2 gtk2 mpfr ];
@ -25,4 +25,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ quag ];
platforms = platforms.linux;
};
}
})

6
pkgs/applications/graphics/pixelnuke/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pixelnuke";
version = "unstable-2019-05-19";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40";
};
sourceRoot = "${src.name}/pixelnuke";
sourceRoot = "${finalAttrs.src.name}/pixelnuke";
buildInputs = [ libevent glew glfw ];
@ -26,4 +26,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ mrVanDalo ];
};
}
})

6
pkgs/applications/networking/browsers/ladybird/default.nix
View file

@ -10,7 +10,7 @@
, nixosTests
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "unstable-2023-01-17";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY=";
};
sourceRoot = "${src.name}/Ladybird";
sourceRoot = "${finalAttrs.src.name}/Ladybird";
postPatch = ''
substituteInPlace CMakeLists.txt \
@ -70,4 +70,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ fgaz ];
platforms = platforms.unix;
};
}
})

6
pkgs/applications/window-managers/wmderlandc/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, libX11, xorgproto }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "wmderlandc";
version = "unstable-2020-07-17";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98";
};
sourceRoot = "${src.name}/ipc-client";
sourceRoot = "${finalAttrs.src.name}/ipc-client";
nativeBuildInputs = [
cmake
@ -29,4 +29,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ takagiy ];
};
}
})

6
pkgs/development/libraries/dab_lib/default.nix
View file

@ -2,7 +2,7 @@
, faad2, fftwFloat, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dab_lib";
version = "unstable-2023-03-02";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4=";
};
sourceRoot = "${src.name}/library/";
sourceRoot = "${finalAttrs.src.name}/library/";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ faad2 fftwFloat zlib ];
@ -25,4 +25,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ alexwinter ];
platforms = platforms.unix;
};
}
})

6
pkgs/os-specific/darwin/libtapi/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libtapi";
version = "1100.0.11"; # determined by looking at VERSION.txt
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr";
};
sourceRoot = "${src.name}/src/llvm";
sourceRoot = "${finalAttrs.src.name}/src/llvm";
# Backported from newer llvm, fixes configure error when cross compiling.
# Also means we don't have to manually fix the result with install_name_tool.
@ -74,4 +74,4 @@ stdenv.mkDerivation rec {
license = licenses.ncsa;
maintainers = with maintainers; [ matthewbauer ];
};
}
})

6
pkgs/os-specific/linux/aseq2json/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "aseq2json";
version = "unstable-2018-04-28";
src = fetchFromGitHub {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a";
sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA=";
};
sourceRoot = "${src.name}/aseq2json";
sourceRoot = "${finalAttrs.src.name}/aseq2json";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib glib json-glib ];
@ -25,4 +25,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.queezle ];
platforms = platforms.linux;
};
}
})

6
pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
View file

@ -11,7 +11,7 @@
, ipuVersion ? "ipu6"
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "${ipuVersion}-camera-bin";
version = "unstable-2023-02-08";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
hash = "sha256-QnedM2UBbGyd2wIF762Mi+VkDZYtC6MifK4XGGxlUzw=";
};
sourceRoot = "${src.name}/${ipuVersion}";
sourceRoot = "${finalAttrs.src.name}/${ipuVersion}";
nativeBuildInputs = [
autoPatchelfHook
@ -76,4 +76,4 @@ stdenv.mkDerivation rec {
];
platforms = [ "x86_64-linux" ];
};
}
})

6
pkgs/os-specific/linux/gt/default.nix
View file

@ -2,7 +2,7 @@
, asciidoc
, libusbgx
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gt";
version = "unstable-2022-05-08";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-km4U+t4Id2AZx6GpH24p2WNmvV5RVjJ14sy8tWLCQsk=";
};
sourceRoot = "${src.name}/source";
sourceRoot = "${finalAttrs.src.name}/source";
preConfigure = ''
cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions")
@ -29,4 +29,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ lheckemann ];
platforms = lib.platforms.linux;
};
}
})

6
pkgs/tools/audio/picotts/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "picotts";
version = "unstable-2018-10-19";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool popt ];
sourceRoot = "${src.name}/pico";
sourceRoot = "${finalAttrs.src.name}/pico";
preConfigure = "./autogen.sh";
meta = {
description = "Text to speech voice sinthesizer from SVox";
@ -21,4 +21,4 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.canndrew ];
platforms = lib.platforms.linux;
};
}
})

13
pkgs/tools/audio/piper/default.nix
View file

@ -16,21 +16,18 @@
, piper-train
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "piper";
version = "1.2.0";
in
stdenv.mkDerivation rec {
inherit pname version;
src = fetchFromGitHub {
owner = "rhasspy";
repo = "piper";
rev = "refs/tags/v${version}";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk=";
};
sourceRoot = "${src.name}/src/cpp";
sourceRoot = "${finalAttrs.src.name}/src/cpp";
nativeBuildInputs = [
cmake
@ -63,10 +60,10 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
changelog = "https://github.com/rhasspy/piper/releases/tag/v${version}";
changelog = "https://github.com/rhasspy/piper/releases/tag/v${finalAttrs.version}";
description = "A fast, local neural text to speech system";
homepage = "https://github.com/rhasspy/piper";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}
})