From e3eace9baa10d524173e34cad3d2a31c2413f8cc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:00 +0000 Subject: linux: 4.14.238 -> 4.14.239 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f418afc280b..5b94b7ea9b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.238"; + version = "4.14.239"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih"; + sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; -- cgit 1.4.1 From cb978946c1a99c8e6a204d0e45cc7078f331673c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:06 +0000 Subject: linux: 4.19.196 -> 4.19.197 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 460982b6d2f..3785c6b5536 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.196"; + version = "4.19.197"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f"; + sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; -- cgit 1.4.1 From a2259ae9a6a48adc580906a9dcfe653f08aa3a94 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:13 +0000 Subject: linux: 5.10.48 -> 5.10.50 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index fd29ff465f8..988de97e03b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.48"; + version = "5.10.50"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv"; + sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; -- cgit 1.4.1 From 677dcff2aa039ede045ad751da0a0877238ed2cc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:18 +0000 Subject: linux: 5.12.15 -> 5.12.17 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 3a482d92a44..82218dc1cef 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.15"; + version = "5.12.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27"; + sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; -- cgit 1.4.1 From 5d99998e07ec4f60da6bd0c822356bfecbbbc947 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:23 +0000 Subject: linux: 5.4.130 -> 5.4.132 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0c8355d101e..003f1e96e4f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.130"; + version = "5.4.132"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6"; + sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; -- cgit 1.4.1 From 9e7fd90e153006f1ec5cdd612eb70305c19019db Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:57 +0000 Subject: linux-rt_5_10: 5.10.47-rt45 -> 5.10.47-rt46 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index efe499d024c..62c411cd969 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.47-rt45"; # updated by ./update-rt.sh + version = "5.10.47-rt46"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay"; + sha256 = "12jnnwnh3bgz2ygc173r45sbqm74rz3f2nlp7m2fb8dlxdby460q"; }; }; in [ rt-patch ] ++ kernelPatches; -- cgit 1.4.1 From 73667e11f3b8da2237b4e43816d59151b2f7af50 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:29 +0000 Subject: linux/hardened/patches/4.14: 4.14.238-hardened1 -> 4.14.239-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e97d9151dbd..cf49bd2b6ac 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.238-hardened1.patch", - "sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch" + "name": "linux-hardened-4.14.239-hardened1.patch", + "sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch" }, "4.19": { "extra": "-hardened1", -- cgit 1.4.1 From 888c46fe62dd87556537da8b04684a63be5cb54e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:30 +0000 Subject: linux/hardened/patches/4.19: 4.19.196-hardened1 -> 4.19.197-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cf49bd2b6ac..961682c9c12 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.196-hardened1.patch", - "sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch" + "name": "linux-hardened-4.19.197-hardened1.patch", + "sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch" }, "5.10": { "extra": "-hardened1", -- cgit 1.4.1 From b724837096d16e1b64f18228e6ab01ca1dc491ce Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:31 +0000 Subject: linux/hardened/patches/5.10: 5.10.48-hardened1 -> 5.10.50-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 961682c9c12..01e945eb494 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.48-hardened1.patch", - "sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch" + "name": "linux-hardened-5.10.50-hardened1.patch", + "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch" }, "5.12": { "extra": "-hardened1", -- cgit 1.4.1 From e6ed15ffc466e5bfe32c14a207c8e70abee50dd2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:32 +0000 Subject: linux/hardened/patches/5.12: 5.12.15-hardened1 -> 5.12.17-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 01e945eb494..45828bd141f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.15-hardened1.patch", - "sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch" + "name": "linux-hardened-5.12.17-hardened1.patch", + "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch" }, "5.4": { "extra": "-hardened1", -- cgit 1.4.1 From f011a85f289507bef66b10759de524d0467821eb Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:33 +0000 Subject: linux/hardened/patches/5.4: 5.4.130-hardened1 -> 5.4.132-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 45828bd141f..eac71ee36aa 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.130-hardened1.patch", - "sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch" + "name": "linux-hardened-5.4.132-hardened1.patch", + "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch" } } -- cgit 1.4.1 From dbf4e2980d120746def13fb0fd334fc7a867756a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 18 Jul 2021 21:23:26 +0200 Subject: pkgs: add maxeaubrey to maintainers --- pkgs/applications/editors/vscode/vscode.nix | 2 +- pkgs/applications/networking/cluster/nomad/generic.nix | 2 +- pkgs/applications/networking/cluster/terraform/default.nix | 1 + pkgs/data/themes/yaru/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- pkgs/os-specific/linux/ell/default.nix | 2 +- pkgs/os-specific/linux/iwd/default.nix | 2 +- pkgs/servers/plex/raw.nix | 1 + 8 files changed, 8 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index dc22a92238e..23af04462ba 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -58,7 +58,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica ]; + maintainers = with maintainers; [ eadwu synthetica maxeaubrey ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index dc22ab41d8b..f4ddc038d2b 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -53,6 +53,6 @@ buildGoPackage rec { description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e4a8c0c0abb..c255ccd1ef8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -62,6 +62,7 @@ let marsam timstott zimbatm + maxeaubrey ]; }; } // attrs'); diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index b37a921bbab..40cfaee17df 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ fortuneteller2k maxeaubrey ]; }; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 69d5789bfb0..e3a005564d0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,7 +100,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar peterhoeg ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ]; }; }); diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 60e597685e4..a43b9eff3c8 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 dtzWill ]; + maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ]; }; } diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 3b7cc7d3d40..e0a1a566d77 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill fpletz ]; + maintainers = with maintainers; [ dtzWill fpletz maxeaubrey ]; }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index b6618eb429d..ff676b27763 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { lnl7 pjones thoughtpolice + maxeaubrey ]; description = "Media library streaming server"; longDescription = '' -- cgit 1.4.1 From d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 18 Jul 2021 23:42:48 +0200 Subject: treewide: convert phases that contain ":" to dont* = true (#130500) --- .../services/continuous-integration/hercules-ci-agent/common.nix | 2 +- .../services/hardware/sane_extra_backends/brscan4_etc_files.nix | 3 +-- pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix | 2 +- pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix | 4 ++-- pkgs/applications/misc/thinking-rock/default.nix | 2 +- pkgs/applications/science/biology/macse/default.nix | 2 +- pkgs/applications/video/vdr/plugins.nix | 2 +- pkgs/development/compilers/apache-flex-sdk/default.nix | 4 ++-- .../libraries/nanopb/test-message-with-annotations/default.nix | 2 +- .../libraries/nanopb/test-message-with-options/default.nix | 2 +- pkgs/development/libraries/nanopb/test-simple-proto2/default.nix | 2 +- pkgs/development/libraries/nanopb/test-simple-proto3/default.nix | 2 +- pkgs/development/python-modules/pytest-astropy/default.nix | 2 +- pkgs/development/ruby-modules/with-packages/default.nix | 2 +- pkgs/development/tools/misc/gede/default.nix | 2 +- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 3 ++- pkgs/development/web/now-cli/default.nix | 2 +- pkgs/misc/apulse/pressureaudio.nix | 3 +-- pkgs/os-specific/linux/wooting-udev-rules/default.nix | 2 +- pkgs/servers/dict/dictd-db.nix | 2 +- pkgs/servers/foundationdb/vsmake.nix | 2 +- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 +- pkgs/tools/backup/ori/default.nix | 2 +- pkgs/tools/misc/sweep-visualizer/default.nix | 2 +- pkgs/tools/misc/zsh-autoenv/default.nix | 2 +- pkgs/tools/system/uefitool/common.nix | 6 ++++-- pkgs/tools/typesetting/tex/texlive/bin.nix | 2 +- 27 files changed, 33 insertions(+), 32 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 2f0b573e872..70d85a97f3b 100644 --- a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -105,7 +105,7 @@ let pkgs.stdenv.mkDerivation { name = "hercules-ci-check-system-nix-src"; inherit (config.nix.package) src patches; - configurePhase = ":"; + dontConfigure = true; buildPhase = '' echo "Checking in-memory pathInfoCache expiry" if ! grep 'PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index 556f6bbb419..9d083a615a2 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -54,8 +54,7 @@ stdenv.mkDerivation { ${addAllNetDev netDevices} ''; - installPhase = ":"; - + dontInstall = true; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix index 3af53cda492..f03aa92c3af 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; - buildPhase = ":"; + dontBuild = true; installPhase = '' install -d $out/share/emacs/site-lisp diff --git a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix index f35a175312c..196a1d122d6 100644 --- a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix +++ b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix @@ -27,7 +27,7 @@ rec { }); buildKakounePluginFrom2Nix = attrs: buildKakounePlugin ({ - buildPhase = ":"; - configurePhase = ":"; + dontBuild = true; + dontConfigure = true; } // attrs); } diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index a26d3cc2eb4..bf53848b5d3 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/thinkingrock ''; - installPhase = ":"; + dontInstall = true; meta = with lib; { description = "Task management system"; diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix index c78e142dcc6..66f4a1671d1 100644 --- a/pkgs/applications/science/biology/macse/default.nix +++ b/pkgs/applications/science/biology/macse/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + dontUnpack = true; dontBuild = true; - unpackPhase = ":"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 2e79cb25c49..6f701779d4d 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -225,7 +225,7 @@ in { mkdir -p $out/lib/vdr ''; - installPhase = ":"; + dontInstall = true; meta = with lib; { homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index 800b1ea55e3..5b5b21aa73d 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { buildInputs = [ jre ]; - buildPhase = ":"; + dontBuild = true; postPatch = '' shopt -s extglob @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc ''; - fixupPhase = ":"; + dontFixup = true; meta = with lib; { description = "Flex SDK for Adobe Flash / ActionScript"; diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix index cda58608d6c..9eca4dbb936 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did # not work because they end up in the store at different locations. - installPhase = ":"; + dontInstall = true; buildPhase = '' mkdir $out diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix index 352ae801500..0030158df91 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did # not work because they end up in the store at different locations. - installPhase = ":"; + dontInstall = true; buildPhase = '' mkdir $out diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix index a915e778537..d1d3e1a855a 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did # not work because they end up in the store at different locations. - installPhase = ":"; + dontInstall = true; buildPhase = '' mkdir $out diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix index 3e2bba731b9..71507054458 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did # not work because they end up in the store at different locations. - installPhase = ":"; + dontInstall = true; buildPhase = '' mkdir $out diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 3df836ee562..981860c7a64 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; # pytest-astropy is a meta package and has no tests - checkPhase = ":"; + doCheck = false; meta = with lib; { description = "Meta-package containing dependencies for testing"; diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix index 7d49b0e0134..5be820b60e3 100644 --- a/pkgs/development/ruby-modules/with-packages/default.nix +++ b/pkgs/development/ruby-modules/with-packages/default.nix @@ -57,7 +57,7 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [ selected ruby ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' for i in ${ruby}/bin/* ${gemEnv}/bin/*; do diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 00ce9958b1f..7b5e8552f82 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { dontUseQmakeConfigure = true; - buildPhase = ":"; + dontBuild = true; installPhase = '' python build.py install --verbose --prefix="$out" diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 93e1cb3804f..d4782b37b6a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation { buildInputs = [ tree-sitter ]; dontUnpack = true; - configurePhase = ":"; + dontConfigure = true; + buildPhase = '' runHook preBuild scanner_cc="$src/src/scanner.cc" diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 3b1d2b4be4b..586fc03687c 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { gunzip -c $curSrc > now-linux ''; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir $out diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index f0b39afb98e..def25474147 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; dontConfigure = true; - - buildPhase = ":"; + dontBuild = true; installPhase = '' echo "Copying libraries from apulse." diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix index 75924ad02a7..f1ae2069235 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules src = [ ./wooting.rules ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -Dpm644 $src $out/lib/udev/rules.d/70-wooting.rules diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index da73a94c2aa..2f317feeda4 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -12,7 +12,7 @@ let inherit src; locale = _locale; dbName = _name; - buildPhase = ":"; + dontBuild = true; unpackPhase = '' tar xf ${src} ''; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index e171d714564..52807fc0620 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -21,7 +21,7 @@ let }; dontConfigure = true; - buildPhase = ":"; + dontBuild = true; installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; }; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index b89ac172500..afa08a8cdce 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; }; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -p $out/share/postgresql/extension cp pg*sql *.control $out/share/postgresql/extension diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 5e6e6a95ae7..01da407695a 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { scons PREFIX=$out WITH_ORILOCAL=1 install ''; - installPhase = ":"; + dontInstall = true; meta = with lib; { description = "A secure distributed file system"; diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index 1ead06ed6e8..74f0807a708 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -21,7 +21,7 @@ ar p "$src" data.tar.xz | tar xJ ''; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -p $out/bin $out/share/sweep-visualizer diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 375f2ebb343..51cfda5e0aa 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "004svkfzhc3ab6q2qvwzgj36wvicg5bs8d2gcibx6adq042di7zj"; }; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix index 7d5ee82dcf9..7b9c8f2e57d 100644 --- a/pkgs/tools/system/uefitool/common.nix +++ b/pkgs/tools/system/uefitool/common.nix @@ -20,8 +20,10 @@ mkDerivation rec { buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake cmake zip ]; - configurePhase = ":"; - buildPhase = "bash unixbuild.sh"; + dontConfigure = true; + buildPhase = '' + bash unixbuild.sh + ''; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 32fba9a8e1f..05c1644c8c7 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -309,7 +309,7 @@ latexindent = perlPackages.buildPerlPackage rec { preConfigure = '' touch Makefile.PL ''; - buildPhase = ":"; + dontBuild = true; installPhase = '' install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} -- cgit 1.4.1