Merge pull request #241714 from figsoda/all
top-level/all-packages.nix: clean up usages of overrideAttrs
This commit is contained in:
Weijia Wang
GitHub
commit
1e1e1a5a74
@ -8471,14 +8471,14 @@ with pkgs;
|
||||
|
||||
grub2 = callPackage ../tools/misc/grub/default.nix {
|
||||
# update breaks grub2
|
||||
gnulib = pkgs.gnulib.overrideAttrs (_: rec {
|
||||
gnulib = pkgs.gnulib.overrideAttrs {
|
||||
version = "20200223";
|
||||
src = fetchgit {
|
||||
url = "https://git.savannah.gnu.org/r/gnulib.git";
|
||||
rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0";
|
||||
sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
grub2_efi = grub2.override {
|
||||
@ -14304,14 +14304,14 @@ with pkgs;
|
||||
|
||||
wget2 = callPackage ../tools/networking/wget2 {
|
||||
# update breaks grub2
|
||||
gnulib = pkgs.gnulib.overrideAttrs (_: rec {
|
||||
gnulib = pkgs.gnulib.overrideAttrs {
|
||||
version = "20210208";
|
||||
src = fetchgit {
|
||||
url = "https://git.savannah.gnu.org/r/gnulib.git";
|
||||
rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971";
|
||||
sha256 = "06bj9y8wcfh35h653yk8j044k7h5g82d2j3z3ib69rg0gy1xagzp";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
wgpu-utils = callPackage ../tools/graphics/wgpu-utils {
|
||||
@ -15308,9 +15308,9 @@ with pkgs;
|
||||
clangMultiStdenv = overrideCC stdenv buildPackages.clang_multi;
|
||||
multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv;
|
||||
|
||||
gcc_debug = lowPrio (wrapCC (gcc.cc.overrideAttrs (_: {
|
||||
gcc_debug = lowPrio (wrapCC (gcc.cc.overrideAttrs {
|
||||
dontStrip = true;
|
||||
})));
|
||||
}));
|
||||
|
||||
gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic;
|
||||
|
||||
@ -21005,7 +21005,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
libgit2_1_3_0 = libgit2.overrideAttrs (_: rec {
|
||||
libgit2_1_3_0 = libgit2.overrideAttrs rec {
|
||||
version = "1.3.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
@ -21014,9 +21014,9 @@ with pkgs;
|
||||
sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920=";
|
||||
};
|
||||
patches = [];
|
||||
});
|
||||
};
|
||||
|
||||
libgit2_1_5 = libgit2.overrideAttrs (_: rec {
|
||||
libgit2_1_5 = libgit2.overrideAttrs rec {
|
||||
version = "1.5.1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
@ -21024,7 +21024,7 @@ with pkgs;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
|
||||
|
||||
@ -21311,7 +21311,7 @@ with pkgs;
|
||||
gtkimageview = callPackage ../development/libraries/gtkimageview { };
|
||||
|
||||
glib = callPackage ../development/libraries/glib (let
|
||||
glib-untested = glib.overrideAttrs (_: { doCheck = false; });
|
||||
glib-untested = glib.overrideAttrs { doCheck = false; };
|
||||
in {
|
||||
# break dependency cycles
|
||||
# these things are only used for tests, they don't get into the closure
|
||||
@ -24261,7 +24261,7 @@ with pkgs;
|
||||
|
||||
rocksdb_lite = rocksdb.override { enableLite = true; };
|
||||
|
||||
rocksdb_6_23 = rocksdb.overrideAttrs (_: rec {
|
||||
rocksdb_6_23 = rocksdb.overrideAttrs rec {
|
||||
pname = "rocksdb";
|
||||
version = "6.23.3";
|
||||
src = fetchFromGitHub {
|
||||
@ -24270,7 +24270,7 @@ with pkgs;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
rotate-backups = callPackage ../tools/backup/rotate-backups { };
|
||||
|
||||
@ -25515,11 +25515,11 @@ with pkgs;
|
||||
|
||||
sqitchMysql = (callPackage ../development/tools/misc/sqitch {
|
||||
mysqlSupport = true;
|
||||
}).overrideAttrs (_: { pname = "sqitch-mysql"; });
|
||||
}).overrideAttrs { pname = "sqitch-mysql"; };
|
||||
|
||||
sqitchPg = (callPackage ../development/tools/misc/sqitch {
|
||||
postgresqlSupport = true;
|
||||
}).overrideAttrs (_: { pname = "sqitch-pg"; });
|
||||
}).overrideAttrs { pname = "sqitch-pg"; };
|
||||
|
||||
### DEVELOPMENT / R MODULES
|
||||
|
||||
@ -27496,13 +27496,13 @@ with pkgs;
|
||||
inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; })
|
||||
linuxHeaders makeLinuxHeaders;
|
||||
|
||||
linuxHeaders_5_19 = linuxHeaders.overrideAttrs (_: rec {
|
||||
linuxHeaders_5_19 = linuxHeaders.overrideAttrs rec {
|
||||
version = "5.19.16";
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
klibc = callPackage ../os-specific/linux/klibc { };
|
||||
|
||||
@ -32437,10 +32437,10 @@ with pkgs;
|
||||
# telegram-desktop has random crashes when jemalloc is built with gcc.
|
||||
# Apparently, it triggers some bug due to usage of gcc's builtin
|
||||
# functions like __builtin_ffsl by jemalloc when it's built with gcc.
|
||||
jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs(_: {
|
||||
jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs {
|
||||
# no idea how to fix the tests :(
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { };
|
||||
@ -35446,12 +35446,12 @@ with pkgs;
|
||||
darwin = true;
|
||||
};
|
||||
};
|
||||
}).overrideAttrs (_: rec {
|
||||
}).overrideAttrs {
|
||||
pname = "vim-darwin";
|
||||
meta = {
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
|
||||
|
||||
@ -36384,7 +36384,7 @@ with pkgs;
|
||||
boost = boost175;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
elementsd-simplicity = elementsd.overrideAttrs (_: rec {
|
||||
elementsd-simplicity = elementsd.overrideAttrs {
|
||||
version = "unstable-2023-04-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ElementsProject";
|
||||
@ -36392,7 +36392,7 @@ with pkgs;
|
||||
rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest
|
||||
sha256 = "ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
ergo = callPackage ../applications/blockchains/ergo { };
|
||||
|
||||
@ -38826,7 +38826,7 @@ with pkgs;
|
||||
ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { };
|
||||
|
||||
isabelle = callPackage ../applications/science/logic/isabelle {
|
||||
polyml = polyml.overrideAttrs (_: {
|
||||
polyml = polyml.overrideAttrs {
|
||||
pname = "polyml-for-isabelle";
|
||||
version = "2022";
|
||||
configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ];
|
||||
@ -38837,7 +38837,7 @@ with pkgs;
|
||||
rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6";
|
||||
sha256 = "1ygs09zzq8icq1gc8qf4sb24lxx7sbcyd5hw3vw67a3ryaki0qw2";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
java = openjdk17;
|
||||
};
|
||||
@ -40942,13 +40942,13 @@ with pkgs;
|
||||
|
||||
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
|
||||
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
|
||||
openfst = openfst.overrideAttrs (_: rec {
|
||||
openfst = openfst.overrideAttrs rec {
|
||||
version = "1.7.9";
|
||||
src = fetchurl {
|
||||
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz";
|
||||
sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
duti = callPackage ../os-specific/darwin/duti {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user