From e922fad91498310b2a169303d4510d325d979d2e Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 16 Sep 2021 13:05:01 +0200 Subject: [PATCH 01/57] kubelet: Disable cgroupsv2 for kubelet hosts --- nixos/modules/services/cluster/kubernetes/kubelet.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 51b2b5f6eb0d..a5158369e09a 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -258,6 +258,8 @@ in "net.bridge.bridge-nf-call-ip6tables" = 1; }; + systemd.enableUnifiedCgroupHierarchy = false; # true breaks node memory metrics + systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; wantedBy = [ "kubernetes.target" ]; From 8cbe7f556415f2ff7b10d4deb74103444a493b55 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 23 Oct 2021 15:16:20 +0100 Subject: [PATCH 02/57] stb: 20180211 -> unstable-2021-09-10 --- pkgs/development/libraries/stb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index a3020e14d3e1..22a97d890e56 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "stb"; - version = "20180211"; + version = "unstable-2021-09-10"; src = fetchFromGitHub { owner = "nothings"; repo = "stb"; - rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2"; - sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf"; + rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a"; + sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr"; }; dontBuild = true; From ef424f2d81612ade1846cac6c71d565e59f9c727 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 07:43:39 +0000 Subject: [PATCH 03/57] xdotool: 3.20210903.1 -> 3.20211022.1 --- pkgs/tools/X11/xdotool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index b9eca0d893a5..736c05c7c7db 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdotool"; - version = "3.20210903.1"; + version = "3.20211022.1"; src = fetchFromGitHub { owner = "jordansissel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE="; + sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k="; }; nativeBuildInputs = [ pkg-config perl ]; From 93e6d80788eda5dcbcce11cc9d06fbf5f7ad906b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 00:27:30 +0000 Subject: [PATCH 04/57] chezmoi: 2.7.3 -> 2.7.4 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index ba8fb3507695..d9ac3a894c67 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-xn9DSbAqfSK7CokxVRrHuOO62oSXKGR0/HZYadLLd74="; + sha256 = "sha256-RX9Hgjl/i/FWXHFp+yYWQEYDiOQijU+eiBnREu4K1Mg="; }; - vendorSha256 = "sha256-e+LsFlF83OGbhajaGGyWARv7O6dI6ZKm3yhDqrgmMpk="; + vendorSha256 = "sha256-tz3Vcw/p7BKcgc3EsLsSPOKhwqN5kysOcmER7OoKQ+w="; doCheck = false; From 6d4b016e263ec5c7278cb9f5c476ee934366e46e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 07:58:50 +0000 Subject: [PATCH 05/57] kubecfg: 0.21.0 -> 0.22.0 --- pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 5efee961b424..0169442e1bfe 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "kubecfg"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-Wu7+Xmb7ha3OG37DzLg2+/Sr9hB5oD3OIkC9h9Fa4QA="; + sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY="; }; goPackagePath = "github.com/bitnami/kubecfg"; From 12077e48144a867f1d64e8b94437b98226e3c712 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 08:06:25 +0000 Subject: [PATCH 06/57] kubedb-cli: 0.21.0 -> 0.22.0 --- pkgs/applications/networking/cluster/kubedb-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 655150580b58..cbf14f43d260 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7e1VQ9uXNj6Lmnl1IXHLcADSLuK7Jgiww8acxtD4xFM="; + sha256 = "sha256-pAvaScbwGJMW3iFS26D71nImWsXcEVx7ONUP82f6QDQ="; }; vendorSha256 = null; From d676fed581a61587b3b230b815169e1eebe4bb42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 08:49:22 +0000 Subject: [PATCH 07/57] lfs: 1.1.0 -> 1.2.1 --- pkgs/tools/filesystems/lfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix index d1988183bf19..65e446fc42f9 100644 --- a/pkgs/tools/filesystems/lfs/default.nix +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "gez5q1niIhzWJpsEkbVRuQFILo3tTO8aJq7ewZArJ5M="; + sha256 = "sha256-Cf9W0LnlvMm0XZe6lvx8hQejcwyfxBC6VKltAAfRD5I="; }; - cargoSha256 = "2U1xDG4bTimtmjwZ1z9ErlaOcBNJdRcHlEWVaiGg01M="; + cargoSha256 = "sha256-skP9VJuRMCyA06YjGbyNIt/DljP3fQQOIQDy6k10zGI="; meta = with lib; { description = "Get information on your mounted disks"; From 365c38c5a157da4a49fc1a9b2737c2eb1ecbdae1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 12:22:25 +0000 Subject: [PATCH 08/57] lightwalletd: 0.4.7 -> 0.4.8 --- pkgs/applications/blockchains/lightwalletd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/applications/blockchains/lightwalletd/default.nix index 0c95dde0f15b..be66fee50e7d 100644 --- a/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/pkgs/applications/blockchains/lightwalletd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lightwalletd"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "zcash"; repo = "lightwalletd"; rev = "v${version}"; - sha256 = "0dwam3fhc4caga7kjg6cc06sz47g4ii7n3sa4j2ac4aiy21hsbjk"; + sha256 = "sha256-3cjXQXJqdmAMc+APybAKbpBhTy8Pk/QyBygSa8pGGAs="; }; vendorSha256 = null; From 21d8230c7748a6c8afb4bd3f936489e9befbb43a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 13:27:23 +0000 Subject: [PATCH 09/57] mark: 6.3 -> 6.4 --- pkgs/tools/text/mark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index b7a4537addaf..229be7448c52 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "6.3"; + version = "6.4"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-HKP8ZYhYDJizZ91q4MRwS00YIMvgB6EJ3au5rMg02hg="; + sha256 = "sha256-Ti7qxNb+7S67bXdvEWPyi/v/OAsAI4pd41dlF7GFjjo="; }; vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; From 9480444dae9d35419e4d06777f8ca2f6013d6984 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 9 Nov 2021 16:09:14 +0100 Subject: [PATCH 10/57] treewide: rename name to pname&version --- pkgs/misc/drivers/gutenprint/bin.nix | 3 +- .../darwin/DarwinTools/default.nix | 5 +- .../darwin/insert_dylib/default.nix | 36 +++++++------- pkgs/os-specific/darwin/maloader/default.nix | 3 +- pkgs/os-specific/linux/fbterm/default.nix | 21 ++++---- .../linux/mwprocapture/default.nix | 14 +++--- pkgs/os-specific/linux/seturgent/default.nix | 16 ++++--- .../os-specific/linux/udisks-glue/default.nix | 11 +++-- pkgs/os-specific/linux/udisks/1-default.nix | 48 +++++++++++++++---- pkgs/os-specific/windows/jom/default.nix | 3 +- pkgs/os-specific/windows/mingwrt/default.nix | 5 +- pkgs/os-specific/windows/w32api/default.nix | 5 +- .../os-specific/windows/wxMSW-2.8/default.nix | 9 ++-- pkgs/tools/X11/primus/lib.nix | 26 ++++++---- .../filesystems/nixpart/0.4/cryptsetup.nix | 22 ++++++--- pkgs/tools/filesystems/nixpart/0.4/dmraid.nix | 5 +- .../nixpart/0.4/multipath-tools.nix | 5 +- pkgs/tools/filesystems/nixpart/0.4/parted.nix | 23 ++++++--- .../inputmethods/fcitx/fcitx-configtool.nix | 9 ++-- pkgs/tools/networking/easyrsa/2.x.nix | 17 +++++-- .../openvpn/openvpn_learnaddress.nix | 5 +- .../networking/openvpn/update-resolv-conf.nix | 6 ++- pkgs/tools/security/gnupg/1.nix | 5 +- pkgs/tools/text/gnused/422.nix | 7 +-- pkgs/tools/typesetting/pdftk/legacy.nix | 9 ++-- pkgs/tools/typesetting/tex/pgf/1.x.nix | 9 ++-- pkgs/tools/typesetting/tex/pgf/2.x.nix | 9 ++-- pkgs/tools/typesetting/tex/pgf/3.x.nix | 9 ++-- 28 files changed, 218 insertions(+), 127 deletions(-) diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 891421d3312c..e1fcb838957c 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -25,7 +25,8 @@ TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how */ stdenv.mkDerivation { - name = "cups-gutenprint-binary-5.0.1"; + pname = "cups-gutenprint-binary"; + version = "5.0.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb"; diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 588769c7bfc6..f648435eed27 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "DarwinTools-1"; + pname = "DarwinTools"; + version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz"; + url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; }; diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index 07e8886e3e63..7ab9692f0d42 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub, xcbuildHook }: -stdenv.mkDerivation - { name = "insert_dylib-2016.08.28"; - src = fetchFromGitHub - { owner = "Tyilo"; - repo = "insert_dylib"; - rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; - sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; - }; - nativeBuildInputs = [ xcbuildHook ]; - installPhase = - '' - mkdir -p $out/bin - install -m755 Products/Release/insert_dylib $out/bin - ''; - meta.platforms = lib.platforms.darwin; - } +stdenv.mkDerivation { + pname = "insert_dylib"; + version = "unstable-2016-08-28"; + + src = fetchFromGitHub { + owner = "Tyilo"; + repo = "insert_dylib"; + rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; + sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; + }; + + nativeBuildInputs = [ xcbuildHook ]; + + installPhase = '' + mkdir -p $out/bin + install -m755 Products/Release/insert_dylib $out/bin + ''; + + meta.platforms = lib.platforms.darwin; +} diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 9142484e043c..bcd9fe6488d2 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, opencflite, clang, libcxx }: stdenv.mkDerivation { - name = "maloader-0git"; + pname = "maloader"; + version = "unstable-2014-02-25"; src = fetchgit { url = "git://github.com/shinh/maloader.git"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 72e886b91f55..4fdbb06c5217 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,19 +1,18 @@ -{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}: +{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }: let s = # Generated upstream information - { - baseName="fbterm"; - version="1.7.0"; - name="fbterm-1.7.0"; - hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; - sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - }; - buildInputs = [gpm freetype fontconfig ncurses] + { + version = "1.7.0"; + pname = "fbterm"; + hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; + sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + }; + buildInputs = [ gpm freetype fontconfig ncurses ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; in stdenv.mkDerivation { - inherit (s) name version; + inherit (s) pname version; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index ca5b82b87858..769bb1e43b44 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -4,25 +4,25 @@ with lib; let bits = - if stdenv.is64bit then "64" - else "32"; + if stdenv.is64bit then "64" + else "32"; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ]; in stdenv.mkDerivation rec { - name = "mwprocapture-1.3.0.${version}-${kernel.version}"; - version = "4236"; + pname = "mwprocapture"; + subVersion = "4236"; + version = "1.3.0.${subVersion}-${kernel.version}"; src = fetchurl { - url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; + url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz"; sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74"; }; nativeBuildInputs = kernel.moduleBuildDependencies; - preConfigure = - '' + preConfigure = '' cd ./src export INSTALL_MOD_PATH="$out" ''; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 2e9e445eddc5..da494f08ca2e 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { - name = "seturgent-2012-08-17"; + pname = "seturgent"; + version = "unstable-2012-08-17"; src = fetchurl { url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip"; @@ -10,7 +11,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ - libX11 xorgproto + libX11 + xorgproto ]; installPhase = '' @@ -19,10 +21,10 @@ stdenv.mkDerivation { ''; meta = { - platforms = lib.platforms.linux; - description = "Set an application's urgency hint (or not)"; - maintainers = [ lib.maintainers.yarr ]; - homepage = "https://github.com/hiltjo/seturgent"; - license = lib.licenses.mit; + platforms = lib.platforms.linux; + description = "Set an application's urgency hint (or not)"; + maintainers = [ lib.maintainers.yarr ]; + homepage = "https://github.com/hiltjo/seturgent"; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 453df94f8fb5..e51a2b1990c3 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: -stdenv.mkDerivation { - name = "udisks-glue-1.3.5"; +stdenv.mkDerivation rec { + pname = "udisks-glue"; + version = "1.3.5"; src = fetchurl { - url = "https://github.com/fernandotcl/udisks-glue/archive/release-1.3.5.tar.gz"; + url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz"; sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; @@ -17,9 +18,9 @@ stdenv.mkDerivation { homepage = "https://github.com/fernandotcl/udisks-glue"; description = "A tool to associate udisks events to user-defined actions"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [pSub]; + maintainers = with lib.maintainers; [ pSub ]; license = lib.licenses.bsd2; broken = true; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index f20dc6b60765..87da3a29d6c0 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,12 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib -, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm -, libxslt, docbook_xsl, util-linux, libgudev }: +{ lib +, stdenv +, fetchurl +, pkg-config +, sg3_utils +, udev +, glib +, dbus +, dbus-glib +, polkit +, parted +, lvm2 +, libatasmart +, intltool +, libuuid +, mdadm +, libxslt +, docbook_xsl +, util-linux +, libgudev +}: stdenv.mkDerivation rec { - name = "udisks-1.0.5"; + pname = "udisks"; + version = "1.0.5"; src = fetchurl { - url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz"; sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; @@ -27,8 +46,21 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev - lvm2 libatasmart intltool libuuid libxslt docbook_xsl + [ + sg3_utils + udev + glib + dbus + dbus-glib + polkit + parted + libgudev + lvm2 + libatasmart + intltool + libuuid + libxslt + docbook_xsl ]; nativeBuildInputs = [ pkg-config ]; @@ -41,6 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2Plus ]; broken = true; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index f3a953576ec9..dfd3f3ff19c3 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -4,7 +4,8 @@ # both mingw32 and mingw64. stdenv.mkDerivation { - name = "jom-1.0.11"; + pname = "jom"; + version = "1.0.11"; src = fetchgit { url = "git://gitorious.org/qt-labs/jom.git"; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 4fb92569a47a..5bf6951cd434 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "mingwrt-5.0.2"; + pname = "mingwrt"; + version = "5.0.2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz"; + url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz"; sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp"; }; diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index ebc95ecaa7a9..99faeeb7a8bf 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "w32api-3.17-2"; + pname = "w32api"; + version = "3.17-2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; + url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma"; sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; }; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index c4fb79933432..bf1e73f67b9a 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: -stdenv.mkDerivation { - name = "wxMSW-2.8.11"; +stdenv.mkDerivation rec { + pname = "wxMSW"; + version = "2.8.11"; src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz"; + url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz"; sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; }; @@ -27,7 +28,7 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit compat24 compat26 unicode;}; + passthru = { inherit compat24 compat26 unicode; }; meta = { platforms = lib.platforms.windows; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index d2f779ddd724..43e0a8233fd0 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL, mesa +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, libX11 +, libGL +, mesa , nvidia_x11 ? null , libglvnd }: @@ -10,8 +15,10 @@ let else if nvidia_x11.useGLVND then libglvnd else nvidia_x11; -in stdenv.mkDerivation { - name = "primus-lib-2015-04-28"; +in +stdenv.mkDerivation { + pname = "primus-lib"; + version = "unstable-2015-04-28"; src = fetchFromGitHub { owner = "amonakov"; @@ -30,11 +37,12 @@ in stdenv.mkDerivation { buildInputs = [ libX11 libGL ]; - makeFlags = [ "LIBDIR=$(out)/lib" - "PRIMUS_libGLa=${aPackage}/lib/libGL.so" - "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" - ]; + makeFlags = [ + "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${aPackage}/lib/libGL.so" + "PRIMUS_libGLd=${libGL}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + ]; installPhase = '' ln -s $out/lib/libGL.so.1 $out/lib/libGL.so diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 6e372b75a7d7..7b2e65d474f7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt -, enablePython ? true, python ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, lvm2 +, libgcrypt +, libuuid +, pkg-config +, popt +, enablePython ? true +, python ? null }: assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.6.3"; + pname = "cryptsetup"; + version = "1.6.3"; src = fetchurl { - url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; + url = "http://cryptsetup.googlecode.com/files/cryptsetup-${version}.tar.bz2"; sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; }; @@ -22,11 +32,11 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-cryptsetup-reencrypt" ] - ++ lib.optional enablePython "--enable-python"; + ++ lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ lvm2 libgcrypt libuuid popt ] - ++ lib.optional enablePython python; + ++ lib.optional enablePython python; meta = with lib; { homepage = "http://code.google.com/p/cryptsetup/"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index c5d8eebc47ca..899af827508a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { - name = "dmraid-1.0.0.rc15"; + pname = "dmraid"; + version = "1.0.0.rc15"; src = fetchurl { - url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 976a3ce2567a..e6d304c2cd37 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -3,10 +3,11 @@ { lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { - name = "multipath-tools-0.4.9"; + pname = "multipath-tools"; + version = "0.4.9"; src = fetchurl { - url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2"; + url = "http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-${version}.tar.bz2"; sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 2891f990afb0..e3dd662c18a9 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,13 +1,22 @@ -{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline -, util-linux, check +{ lib +, stdenv +, fetchurl +, fetchpatch +, lvm2 +, libuuid +, gettext +, readline +, util-linux +, check , enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { - name = "parted-3.1"; + pname = "parted"; + version = "3.1"; src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; + url = "mirror://gnu/parted/parted-${version}.tar.xz"; sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; }; @@ -26,9 +35,9 @@ stdenv.mkDerivation rec { ++ lib.optional (lvm2 != null) lvm2; configureFlags = - (if (readline != null) - then [ "--with-readline" ] - else [ "--without-readline" ]) + (if (readline != null) + then [ "--with-readline" ] + else [ "--without-readline" ]) ++ lib.optional (lvm2 == null) "--disable-device-mapper" ++ lib.optional enableStatic "--enable-static"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 3d34dcbac175..ccbec8209e9a 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }: stdenv.mkDerivation rec { - name = "fcitx-configtool-0.4.10"; + pname = "fcitx-configtool"; + version = "0.4.10"; meta = with lib; { description = "GTK-based config tool for Fcitx"; - license = licenses.gpl2; - platforms = platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; maintainers = with maintainers; [ cdepillabout ]; }; src = fetchurl { - url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-${version}.tar.xz"; sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w"; }; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index 52cf2082d63f..42188cfbfff1 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,11 +1,18 @@ -{ lib, stdenv, fetchurl, autoreconfHook, makeWrapper -, gnugrep, openssl }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, makeWrapper +, gnugrep +, openssl +}: -stdenv.mkDerivation { - name = "easyrsa-2.2.0"; +stdenv.mkDerivation rec { + pname = "easyrsa"; + version = "2.2.0"; src = fetchurl { - url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz"; + url = "https://github.com/OpenVPN/easy-rsa/archive/v${version}.tar.gz"; sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk"; }; diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 2120679fef3e..514491c2be21 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { - name = "openvpn-learnaddress-19b03c3"; + pname = "openvpn-learnaddress"; + version = "unstable-2013-10-21"; src = fetchgit { url = "https://gist.github.com/4058733.git"; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index d71ab72901bc..e8533a214af1 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -3,8 +3,10 @@ let binPath = lib.makeBinPath [ coreutils openresolv systemd ]; -in stdenv.mkDerivation { - name = "update-resolv-conf-2017-06-21"; +in +stdenv.mkDerivation { + pname = "update-resolv-conf"; + version = "unstable-2017-06-21"; src = fetchFromGitHub { owner = "masterkorp"; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 66b05384c6be..8fc5dce7ba04 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.23"; + pname = "gnupg"; + version = "1.4.23"; src = fetchurl { - url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + url = "mirror://gnupg/gnupg/gnupg-${version}.tar.bz2"; sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"; }; diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 6b16f01f2fa1..15e57e319019 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "gnused-4.2.2"; +stdenv.mkDerivation rec { + pname = "gnused"; + version = "4.2.2"; src = fetchurl { - url = "mirror://gnu/sed/sed-4.2.2.tar.bz2"; + url = "mirror://gnu/sed/sed-${version}.tar.bz2"; sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix index 3c4d042097ff..189978870376 100644 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, gcj, unzip }: -stdenv.mkDerivation { - name = "pdftk-2.02"; +stdenv.mkDerivation rec { + pname = "pdftk"; + version = "2.02"; src = fetchurl { - url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; + url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip"; sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; }; @@ -36,7 +37,7 @@ stdenv.mkDerivation { description = "Simple tool for doing everyday things with PDF documents"; homepage = "https://www.pdflabs.com/tools/pdftk-server/"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [raskin]; + maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; broken = true; # Broken on Hydra since 2020-08-24 }; diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index efaf0e0fe1b3..618f936d8bf8 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "pgf-1.18"; +stdenv.mkDerivation rec { + pname = "pgf"; + version = "1.18"; src = fetchurl { - url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz"; + url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz"; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 9661ec3324be..b8a3f2f63660 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "pgf-2.00"; +stdenv.mkDerivation rec { + pname = "pgf"; + version = "2.00"; src = fetchurl { - url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; + url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz"; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index b33f05d34a78..9af41ff1f43f 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, unzip}: +{ lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "pgf-3.00"; +stdenv.mkDerivation rec { + pname = "pgf"; + version = "3.0.0"; src = fetchurl { - url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip"; + url = "mirror://sourceforge/project/pgf/pgf/version%20${version}/pgf_${version}.tds.zip"; sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; From 0a79063bacd15b7b1668335a5a50fb7073b55c64 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 10 Nov 2021 16:49:35 +0200 Subject: [PATCH 11/57] python3.pkgs.docstring-to-markdown: init at 0.9 --- .../docstring-to-markdown/default.nix | 37 +++++++++++++++++++ .../remove-coverage-tests.patch | 16 ++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/docstring-to-markdown/default.nix create mode 100644 pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix new file mode 100644 index 000000000000..f4f2a36f5394 --- /dev/null +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "docstring-to-markdown"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XVTlSqqWmvnB5nvjvgGDJmg71KKTq2hHB4//QW7ugvA="; + }; + + patches = [ + # So pytest-flake8 and pytest-cov won't be needed + ./remove-coverage-tests.patch + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "docstring_to_markdown" + ]; + + meta = with lib; { + homepage = "https://github.com/python-lsp/docstring-to-markdown"; + description = "On the fly conversion of Python docstrings to markdown"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch b/pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch new file mode 100644 index 000000000000..68bc626ced91 --- /dev/null +++ b/pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch @@ -0,0 +1,16 @@ +diff --git i/setup.cfg w/setup.cfg +index e880e74..e77133e 100644 +--- i/setup.cfg ++++ w/setup.cfg +@@ -34,11 +34,7 @@ docstring-to-markdown = py.typed + [tool:pytest] + addopts = + --pyargs tests +- --cov docstring_to_markdown +- --cov-fail-under=98 +- --cov-report term-missing:skip-covered + -p no:warnings +- --flake8 + -vv + + [flake8] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6d07f926e1f..acf941a0756f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2267,6 +2267,8 @@ in { docloud = callPackage ../development/python-modules/docloud { }; + docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { }; + docopt = callPackage ../development/python-modules/docopt { }; docopt-ng = callPackage ../development/python-modules/docopt-ng { }; From c02d778b1c07c3ed944844bcbbd99cae45e9df65 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 10 Nov 2021 16:49:56 +0200 Subject: [PATCH 12/57] python3.pkgs.jedi-language-server: init at 0.34.8 --- .../jedi-language-server/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/jedi-language-server/default.nix diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix new file mode 100644 index 000000000000..8aead2738f40 --- /dev/null +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, poetry +, docstring-to-markdown +, jedi +, pygls +, pytestCheckHook +, pyhamcrest +, python-jsonrpc-server +}: + +buildPythonPackage rec { + pname = "jedi-language-server"; + version = "0.34.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pappasam"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mJGgDDjPZXde4M4OHwj81KYoaFXFAwOZ+v18YE+arFE="; + }; + + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + docstring-to-markdown + jedi + pygls + ]; + + checkInputs = [ + pytestCheckHook + pyhamcrest + python-jsonrpc-server + ]; + + preCheck = '' + HOME="$(mktemp -d)" + ''; + + pythonImportsCheck = [ + "jedi_language_server" + ]; + + meta = with lib; { + homepage = "https://github.com/pappasam/jedi-language-server"; + description = "A Language Server for the latest version(s) of Jedi"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acf941a0756f..d75067d3c13b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3931,6 +3931,8 @@ in { jedi = callPackage ../development/python-modules/jedi { }; + jedi-language-server = callPackage ../development/python-modules/jedi-language-server { }; + jeepney = callPackage ../development/python-modules/jeepney { }; jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; From d3c28b6f842ad813c61edb7330e012e3da3fb6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 18:10:20 +0100 Subject: [PATCH 13/57] highlight: remove with lib; convert prePatch to postPatch --- pkgs/tools/text/highlight/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 82d5eab5086f..57c607e69c6b 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkg-config, swig, perl, gcc }: -with lib; - let self = stdenv.mkDerivation rec { pname = "highlight"; @@ -16,11 +14,12 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config swig perl ] ++ optional stdenv.isDarwin gcc; + nativeBuildInputs = [ pkg-config swig perl ] + ++ lib.optional stdenv.isDarwin gcc; buildInputs = [ getopt lua boost ]; - prePatch = '' + postPatch = '' substituteInPlace src/makefile \ --replace "shell pkg-config" "shell $PKG_CONFIG" substituteInPlace makefile \ @@ -36,15 +35,15 @@ let # This has to happen _before_ the main build because it does a # `make clean' for some reason. - preBuild = optionalString (!stdenv.isDarwin) '' + preBuild = lib.optionalString (!stdenv.isDarwin) '' make -C extras/swig $makeFlags perl ''; - postCheck = optionalString (!stdenv.isDarwin) '' + postCheck = lib.optionalString (!stdenv.isDarwin) '' perl -Iextras/swig extras/swig/testmod.pl ''; - preInstall = optionalString (!stdenv.isDarwin) '' + preInstall = lib.optionalString (!stdenv.isDarwin) '' mkdir -p $out/${perl.libPrefix} install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix} make -C extras/swig clean # Clean up intermediate files. From 5fd4c742d89bf2f4f8240608e4cb4794a738e231 Mon Sep 17 00:00:00 2001 From: yuu Date: Tue, 9 Nov 2021 10:31:22 -0300 Subject: [PATCH 14/57] python3Packages.wavefile: init at 1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jonathan Ringer Co-authored-by: Sandro Jäckel Co-authored-by: Thiago K. Okada --- .../python-modules/wavefile/default.nix | 64 +++++++++++++++++++ .../wavefile/libsndfile.py.patch | 18 ++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/development/python-modules/wavefile/default.nix create mode 100644 pkgs/development/python-modules/wavefile/libsndfile.py.patch diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix new file mode 100644 index 000000000000..3090ee815440 --- /dev/null +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pyaudio +, numpy +, libsndfile +, substituteAll +}: + +buildPythonPackage rec { + pname = "wavefile"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "vokimon"; + repo = "python-wavefile"; + rev = "python-wavefile-${version}"; + sha256 = "9sHj1gb93mCVpejRGSdLJzeFDCeTflZctE7kMWfqFrE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + pyaudio + libsndfile + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pyaudio + numpy + libsndfile + ]; + + patches = [ + # Fix check error + # OSError: libsndfile.so.1: cannot open shared object file: No such file or directory + (substituteAll { + src = ./libsndfile.py.patch; + libsndfile = "${lib.getLib libsndfile}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + doCheck = false; # all test files (test/wavefileTest.py) are failing + + pythonImportsCheck = [ + "wavefile" + ]; + + meta = with lib; { + description = "Pythonic libsndfile wrapper to read and write audio files"; + homepage = "https://github.com/vokimon/python-wavefile"; + changelog = "https://github.com/vokimon/python-wavefile#version-history"; + maintainers = with maintainers; [ yuu ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/wavefile/libsndfile.py.patch b/pkgs/development/python-modules/wavefile/libsndfile.py.patch new file mode 100644 index 000000000000..6e10e6b6c03c --- /dev/null +++ b/pkgs/development/python-modules/wavefile/libsndfile.py.patch @@ -0,0 +1,18 @@ +diff --git a/wavefile/libsndfile.py b/wavefile/libsndfile.py +index 67f0a46..ce066ee 100644 +--- a/wavefile/libsndfile.py ++++ b/wavefile/libsndfile.py +@@ -19,11 +19,11 @@ import numpy as np + if sys.platform == "win32": + dllName = 'libsndfile-1' + elif "linux" in sys.platform: +- dllName = 'libsndfile.so.1' ++ dllName = '@libsndfile@' + elif "cygwin" in sys.platform: + dllName = 'libsndfile-1.dll' + elif "darwin" in sys.platform: +- dllName = 'libsndfile.dylib' ++ dllName = '@libsndfile@' + else: + dllName = 'libsndfile' + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20200f9c71fb..69d14b043a27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9782,6 +9782,8 @@ in { wavedrom = callPackage ../development/python-modules/wavedrom { }; + wavefile = callPackage ../development/python-modules/wavefile { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; From 1c6dc994a85365509cd5b7b11894613c65c44ca7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 11 Nov 2021 17:55:53 -0500 Subject: [PATCH 15/57] yoda-with-root: fix sandboxed build --- pkgs/development/libraries/physics/yoda/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 6fb9b9560aae..a804766b85dc 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xhagWmVlvlsayL0oWTihoxhq0ejejEACCsdQqFN1HUw="; }; + patches = [ + # Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing) + (fetchpatch { + url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff"; + sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk="; + excludes = [ "ChangeLog" ]; + }) + ]; + nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) From 596f47648ed594d0ad35c871b3ba8c9176ad3442 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 15:55:02 +0100 Subject: [PATCH 16/57] imgpatchtools: switch to fetchFromGitHub --- pkgs/development/mobile/imgpatchtools/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index c45e4973f564..2b746423cfe9 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, bzip2, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, bzip2, openssl, zlib }: stdenv.mkDerivation rec { pname = "imgpatchtools"; version = "0.3"; - src = fetchzip { - url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz"; - sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd"; + src = fetchFromGitHub { + owner = "erfanoabdi"; + repo = "imgpatchtools"; + rev = version; + sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M="; }; buildInputs = [ bzip2 openssl zlib ]; From cc8f33e08fc23f5f31974e12429fa278e4229628 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 15:57:45 +0100 Subject: [PATCH 17/57] vo-amrwbenc: switch to fetchFromGitHub --- .../libraries/vo-amrwbenc/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index dccbd1349d2c..8ad78703d531 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: -let - version = "0.1.3"; -in -stdenv.mkDerivation { - name = "vo-amrwbenc-${version}"; +stdenv.mkDerivation rec{ + pname = "vo-amrwbenc"; version = "0.1.3"; - buildInputs = [ autoreconfHook ]; - src = fetchurl { - url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz"; - sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c"; + + src = fetchFromGitHub { + owner = "mstorsjo"; + repo = "vo-amrwbenc"; + rev = "v${version}"; + sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w="; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = { homepage = "https://sourceforge.net/projects/opencore-amr/"; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; From 1a54992c09a924aa169176af063bd399edfb5636 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 15:58:00 +0100 Subject: [PATCH 18/57] vigra: switch to fetchFromGitHub --- pkgs/development/libraries/vigra/default.nix | 54 +++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 56402172d9ff..d6d43e6a1fb3 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,35 +1,65 @@ -{ lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase -, libjpeg, libpng, libtiff, openexr, python2Packages }: +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, boost +, cmake +, fftw +, fftwSinglePrec +, hdf5 +, ilmbase +, libjpeg +, libpng +, libtiff +, openexr +, python2Packages +}: let inherit (python2Packages) python numpy; # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "vigra"; version = "1.11.1"; - src = fetchurl { - url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz"; - sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj"; + src = fetchFromGitHub { + owner = "ukoethe"; + repo = "vigra"; + rev = "Version-${lib.replaceChars ["."] ["-"] version}"; + sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk="; }; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414 patches = - let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; - sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; }; + let clangPatch = fetchurl { + url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; + sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; + }; in [ clangPatch ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng - libtiff numpy openexr python ]; + buildInputs = [ + boost + fftw + fftwSinglePrec + hdf5 + ilmbase + libjpeg + libpng + libtiff + numpy + openexr + python + ]; preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; cmakeFlags = [ "-DWITH_OPENEXR=1" ] - ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") - [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") + [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" doCheck = false; From 258b28b03e3d2414cc9121209c5da1057344daf7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 15:58:11 +0100 Subject: [PATCH 19/57] vaapi-intel-hybrid: switch to fetchFromGitHub --- .../libraries/vaapi-intel-hybrid/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 00e9a2042b7a..e137f97698eb 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { pname = "intel-hybrid-driver"; version = "1.0.2"; - src = fetchurl { - url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz"; - sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n"; + src = fetchFromGitHub { + owner = "01org"; + repo = "intel-hybrid-driver"; + rev = version; + sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8="; }; patches = [ From 512b6d19df1cf8ab47625b552c7f885a4d001545 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:04:01 +0100 Subject: [PATCH 20/57] stxxl: switch to fetchFromGitHub --- pkgs/development/libraries/stxxl/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index eec4f722d411..5cc0e6037a23 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, cmake +{ lib +, stdenv +, fetchFromGitHub +, cmake , parallel ? true }: @@ -10,9 +13,11 @@ stdenv.mkDerivation rec { pname = "stxxl"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz"; - sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; + src = fetchFromGitHub { + owner = "stxxl"; + repo = "stxxl"; + rev = version; + sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I="; }; nativeBuildInputs = [ cmake ]; From c83dbfae34e23009f997ff77276c0692c57065c0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:04:12 +0100 Subject: [PATCH 21/57] sfml: switch to fetchFromGitHub --- pkgs/development/libraries/sfml/default.nix | 40 +++++++++++++++------ 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 7ed5070ebb08..cc3fa2df97a0 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,15 +1,33 @@ -{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis -, glew, libXrandr, libXrender, udev, xcbutilimage -, IOKit, Foundation, AppKit, OpenAL +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libX11 +, freetype +, libjpeg +, openal +, flac +, libvorbis +, glew +, libXrandr +, libXrender +, udev +, xcbutilimage +, IOKit +, Foundation +, AppKit +, OpenAL }: stdenv.mkDerivation rec { pname = "sfml"; version = "2.5.1"; - src = fetchzip { - url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; - sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay"; + src = fetchFromGitHub { + owner = "SFML"; + repo = "SFML"; + rev = version; + sha256 = "sha256-Xt2Ct4vV459AsSvJxQfwMsNs6iA5y3epT95pLWJGeSk="; }; nativeBuildInputs = [ cmake ]; @@ -18,10 +36,12 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; - cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" - "-DSFML_MISC_INSTALL_PREFIX=share/SFML" - "-DSFML_BUILD_FRAMEWORKS=no" - "-DSFML_USE_SYSTEM_DEPS=yes" ]; + cmakeFlags = [ + "-DSFML_INSTALL_PKGCONFIG_FILES=yes" + "-DSFML_MISC_INSTALL_PREFIX=share/SFML" + "-DSFML_BUILD_FRAMEWORKS=no" + "-DSFML_USE_SYSTEM_DEPS=yes" + ]; meta = with lib; { homepage = "https://www.sfml-dev.org/"; From e4d876957f67e01c87da13d546650091b5fa35c0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:04:23 +0100 Subject: [PATCH 22/57] primesieve: switch to fetchFromGitHub --- .../libraries/science/math/primesieve/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index d4f16d230e60..15b4d6a66a30 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "primesieve"; version = "7.6"; - nativeBuildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; - src = fetchurl { - url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; - sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk="; + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primesieve"; + rev = "v${version}"; + sha256 = "sha256-rSNYoWBy80BgPi1c+BSKbWTyGGb7/fxmu+mq1DXakHY="; }; meta = with lib; { From e4d3fd0531aab5f212de8d0100d360b57d52adea Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:04:40 +0100 Subject: [PATCH 23/57] openlibm: switch to fetchFromGitHub --- .../libraries/science/math/openlibm/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 0252b7baa162..84c01d80d0a6 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "openlibm"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "sha256-A2IHaN9MpSamPdZ1xt6VpcnRZ/9ZVVzlemHGv0nkAO4="; + + src = fetchFromGitHub { + owner = "JuliaLang"; + repo = "openlibm"; + rev = "v${version}"; + sha256 = "sha256-dEM10picZXiPokzSHCfxhS7fwZ0sMjil4bni+PHBCeI="; }; makeFlags = [ "prefix=$(out)" ]; From 14550c58c663a5c491c5fdf2082ed21b0d8b4178 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:04:52 +0100 Subject: [PATCH 24/57] openbabel: switch to fetchFromGitHub --- pkgs/development/libraries/openbabel/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 63784d94d8f0..a23382d3f892 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,15 +1,16 @@ -{stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: +{ stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: stdenv.mkDerivation rec { pname = "openbabel"; version = "3.1.1"; - src = fetchurl { - url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02"; + src = fetchFromGitHub { + owner = "openbabel"; + repo = "openbabel"; + rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}"; + sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; }; - buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -21,7 +22,6 @@ stdenv.mkDerivation rec { "-DPYTHON_BINDINGS=ON" ]; - postFixup = '' cat < $out/lib/python$pythonMajorMinor/site-packages/setup.py from distutils.core import setup @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { package_data = {'openbabel' : ['_openbabel.so']} ) EOF - ''; + ''; meta = with lib; { description = "A toolbox designed to speak the many languages of chemical data"; From ab052237873e32b8d78bc6ba3e35569b5fb1652e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:05:05 +0100 Subject: [PATCH 25/57] ogrepaged: switch to fetchFromGitHub --- pkgs/development/libraries/ogrepaged/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 0aefedb52575..8209d32f759a 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { pname = "ogre-paged"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz"; - sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82"; + src = fetchFromGitHub { + owner = "RigsOfRods"; + repo = "ogre-pagedgeometry"; + rev = "v${version}"; + sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U="; }; patches = [ From 6a66defae05eb72ff4dadb41d937430378086f1f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:05:17 +0100 Subject: [PATCH 26/57] ogre: switch to fetchFromGitHub --- pkgs/development/libraries/ogre/default.nix | 76 +++++++++++++++------ 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index d097dc623e76..e5e6f5f7ce71 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,40 +1,76 @@ -{ fetchurl, stdenv, lib -, cmake, libGLU, libGL -, freetype, freeimage, zziplib, xorgproto, libXrandr -, libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkg-config -, libXxf86vm, libICE +{ fetchFromGitHub +, stdenv +, lib +, cmake +, libGLU +, libGL +, freetype +, freeimage +, zziplib +, xorgproto +, libXrandr +, libXaw +, freeglut +, libXt +, libpng +, boost +, ois +, libX11 +, libXmu +, libSM +, pkg-config +, libXxf86vm +, libICE , unzip , libXrender , SDL2 -, withNvidiaCg ? false, nvidia_cg_toolkit -, withSamples ? false }: +, withNvidiaCg ? false +, nvidia_cg_toolkit +, withSamples ? false +}: stdenv.mkDerivation rec { pname = "ogre"; version = "1.12.1"; - src = fetchurl { - url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; - sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; + src = fetchFromGitHub { + owner = "OGRECave"; + repo = "ogre"; + rev = "v${version}"; + sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; }; cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; nativeBuildInputs = [ cmake unzip pkg-config ]; buildInputs = - [ cmake libGLU libGL - freetype freeimage zziplib xorgproto libXrandr - libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM - libXxf86vm libICE - libXrender - SDL2 - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + [ + cmake + libGLU + libGL + freetype + freeimage + zziplib + xorgproto + libXrandr + libXaw + freeglut + libXt + libpng + boost + ois + libX11 + libXmu + libSM + libXxf86vm + libICE + libXrender + SDL2 + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { description = "A 3D engine"; From ac38bd869e5c7431f888ef3ea3cbb2efaa3950ce Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:05:34 +0100 Subject: [PATCH 27/57] netcdf-fortran: switch to fetchFromGitHub --- pkgs/development/libraries/netcdf-fortran/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 503226ddcbb3..fc13fbe85bfd 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: +{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { pname = "netcdf-fortran"; version = "4.4.5"; - src = fetchurl { - url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; + src = fetchFromGitHub { + owner = "Unidata"; + repo = "netcdf-fortran"; + rev = "v${version}"; + sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0="; }; nativeBuildInputs = [ gfortran ]; From 9587435e265e6e9d5deeb2bb7b7b1f1c2cb2fa9b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:05:47 +0100 Subject: [PATCH 28/57] netcdf-cxx4: switch to fetchFromGitHub --- pkgs/development/libraries/netcdf-cxx4/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 494f4bf71575..698a8152a445 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, netcdf, hdf5, curl, cmake, ninja }: +{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, cmake, ninja }: stdenv.mkDerivation rec { pname = "netcdf-cxx4"; version = "4.3.1"; - src = fetchzip { - url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz"; - sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr"; + src = fetchFromGitHub { + owner = "Unidata"; + repo = "netcdf-cxx4"; + rev = "v${version}"; + sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; }; preConfigure = '' From 3149762bbfb19085b9a8d053dfc03019ae9d9467 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:06:00 +0100 Subject: [PATCH 29/57] nco: switch to fetchFromGitHub --- pkgs/development/libraries/nco/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 22267ea554de..7262d7f661c8 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: +{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: stdenv.mkDerivation rec { pname = "nco"; version = "5.0.3"; - src = fetchzip { - url = "https://github.com/nco/nco/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "nco"; + repo = "nco"; + rev = "${version}"; sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw="; }; From 3124df04137894a2fdbdb5e003d4cf8fda59433a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 1 Nov 2021 16:06:11 +0100 Subject: [PATCH 30/57] luabind: switch to fetchFromGitHub --- pkgs/development/libraries/luabind/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index d7aed656fdb9..b36e6f34c826 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -1,11 +1,14 @@ -{lib, stdenv, fetchurl, boost-build, lua, boost}: +{ lib, stdenv, fetchFromGitHub, boost-build, lua, boost }: -stdenv.mkDerivation { - name = "luabind-0.9.1"; +stdenv.mkDerivation rec { + pname = "luabind"; + version = "0.9.1"; - src = fetchurl { - url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz"; - sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; + src = fetchFromGitHub { + owner = "luabind"; + repo = "luabind"; + rev = "v${version}"; + sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag="; }; patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ]; From 4e7c9c1eb8359c788b63514ba5cb831c9e64031f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 11 Nov 2021 17:59:07 -0500 Subject: [PATCH 31/57] yoda: 1.9.1 -> 1.9.2 --- .../libraries/physics/yoda/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 6fb9b9560aae..a07b9d5370fd 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "sha256-xhagWmVlvlsayL0oWTihoxhq0ejejEACCsdQqFN1HUw="; + hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA="; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; @@ -32,18 +32,13 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "check"; - - # Workaround for https://gitlab.com/hepcedar/yoda/-/merge_requests/49 - preInstallCheck = '' - cp tests/test{1,}.yoda - gzip -c tests/test.yoda > tests/test.yoda.gz - ''; + enableParallelChecking = false; # testreader consumes output of testwriter meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = lib.licenses.gpl3; - homepage = "https://yoda.hepforge.org"; - platforms = lib.platforms.unix; + license = lib.licenses.gpl3; + homepage = "https://yoda.hepforge.org"; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; } From 34ec80c1e17e140b77be6e72804a70ab6c8133c9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 11 Nov 2021 22:53:03 -0500 Subject: [PATCH 32/57] rivet: 3.1.4 -> 3.1.5 --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 9d3124987048..b041dd483e1b 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0="; + hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo="; }; latex = texlive.combine { inherit (texlive) From ecc55a619d1981cc8442e059bbd68680fcf48454 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 12 Nov 2021 14:55:56 +0200 Subject: [PATCH 33/57] octave: 6.3.0 -> 6.4.0 --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 6a1d6c30cc18..033cc2f872ab 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -114,12 +114,12 @@ let }; self = mkDerivation rec { - version = "6.3.0"; + version = "6.4.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-IyBl86cvwwE/6fF/Qpo99p1nLB9rYHcCmjHI881Ypm4="; + sha256 = "sha256-tI8z1Pzq85TPvqc6jIUAAJNtg6QXOaJPdWi1sKezms0="; }; buildInputs = [ From 21727e4915fe605d479e0ec342e02558dd4fa962 Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 12 Nov 2021 21:50:32 -0500 Subject: [PATCH 34/57] bazel: replace additional usages of md5sum --- .../tools/build-managers/bazel/bazel_3/default.nix | 4 ++-- .../tools/build-managers/bazel/bazel_4/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 1f51fceff3b5..a08f7a62eae6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -405,8 +405,8 @@ stdenv.mkDerivation rec { substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|' \ - src/BUILD + sed -i 's|/sbin/md5|md5sum|g' \ + src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh # replace initial value of pythonShebang variable in BazelPythonSemantics.java substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 36f7ffb8a5d3..f2006fdc6d18 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -434,8 +434,8 @@ stdenv.mkDerivation rec { substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|' \ - src/BUILD + sed -i 's|/sbin/md5|md5sum|g' \ + src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh # replace initial value of pythonShebang variable in BazelPythonSemantics.java substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ From f17e7e684dd90ee02988b5045d2e474ace0b92c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 13 Nov 2021 09:40:35 +0100 Subject: [PATCH 35/57] linux_zen: 5.15.1-zen1 -> 5.15.2-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 73bc0bbbb8a9..e259ec04f28a 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.1-zen1"; + modDirVersion = "5.15.2-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-mDAwsqLR55WFaPKO1SXZuxeuaFzprMY4ryeEUdCqKGU="; + sha256 = "sha256-6cYKlRAd8kbphIThmTdWieH322Rj1KSmCJCmYRt8o2w="; }; structuredExtraConfig = with lib.kernel; { From b9f30c203c4c4803792a95951320eb3e6079353e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 13 Nov 2021 09:32:52 -0300 Subject: [PATCH 36/57] enlightenment.terminology: 1.10.0 -> 1.11.0 --- pkgs/desktops/enlightenment/terminology/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index e74f91d8d483..10b97436b911 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz"; + sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g"; }; nativeBuildInputs = [ From 9b001407a104fbdbb8fbcb72db7d0586bdc76795 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sat, 13 Nov 2021 13:43:29 +0100 Subject: [PATCH 37/57] pkgs.development.python-modules: remove unused args --- pkgs/development/python-modules/cirq-core/default.nix | 1 - pkgs/development/python-modules/h5py/default.nix | 4 ++-- pkgs/development/python-modules/jaxlib/default.nix | 2 +- .../python-modules/jupyter-repo2docker/default.nix | 2 -- pkgs/development/python-modules/lexid/default.nix | 2 +- pkgs/development/python-modules/pynest2d/default.nix | 2 +- pkgs/development/python-modules/pytest-trio/default.nix | 2 +- pkgs/development/python-modules/pytest/5.nix | 3 --- pkgs/development/python-modules/python-nest/default.nix | 2 +- pkgs/development/python-modules/sh/default.nix | 2 +- pkgs/development/python-modules/spacy/default.nix | 1 - pkgs/development/python-modules/stestr/tests.nix | 6 +----- 12 files changed, 9 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 83674eb8c763..92045eb3e3ef 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index dfa4288e54fc..e555a41cfb0a 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder -, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch +{ lib, fetchPypi, isPy27, buildPythonPackage, pythonOlder +, numpy, hdf5, cython, six, pkgconfig, unittest2 , mpi4py ? null, openssh, pytestCheckHook, cached-property }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 7761c0372994..f597eeacfced 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -13,7 +13,7 @@ # * https://github.com/google/jax/issues/971#issuecomment-508216439 # * https://github.com/google/jax/issues/5723#issuecomment-913038780 -{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi +{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config , fetchurl, isPy39, lib, stdenv # propagatedBuildInputs , absl-py, flatbuffers, scipy, cudatoolkit_11 diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 1963763a7c95..e147a5952cf4 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,7 +1,5 @@ { lib -, bash , buildPythonPackage -, chardet , docker , entrypoints , escapism diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 5ef175d57878..0e9cf69ea8c0 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -1,4 +1,4 @@ -{ lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }: +{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }: buildPythonPackage rec { pname = "lexid"; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 5d6a006634e2..1f338806a18f 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, python3, cmake -, pythonOlder, libnest2d, sip_4, clipper }: +, libnest2d, sip_4, clipper }: buildPythonPackage rec { version = "4.10.0"; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index a9327e2b2320..e42ed5c68386 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, trio, python, async_generator, hypothesis, outcome, pytest }: +, trio, async_generator, hypothesis, outcome, pytest }: buildPythonPackage rec { pname = "pytest-trio"; diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index b38c1a759fe3..913133cd7818 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -1,16 +1,13 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs -, funcsigs , hypothesis -, mock , more-itertools , packaging , pathlib2 , pluggy , py , pygments -, python , setuptools , setuptools-scm , six diff --git a/pkgs/development/python-modules/python-nest/default.nix b/pkgs/development/python-modules/python-nest/default.nix index c894654e41e6..8caa61517c6f 100644 --- a/pkgs/development/python-modules/python-nest/default.nix +++ b/pkgs/development/python-modules/python-nest/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, python, python-dateutil, requests +{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests , six, sseclient-py }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index c8da91750f02..a08920a39e2b 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales, coreutils }: +{ lib, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales, coreutils }: buildPythonPackage rec { pname = "sh"; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index c0c8593452c0..d959ad8947d6 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -11,7 +11,6 @@ , jsonschema , murmurhash , numpy -, pathlib , preshed , requests , setuptools diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix index 7a5d47b5dcfe..35fd1ce71a20 100644 --- a/pkgs/development/python-modules/stestr/tests.nix +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -1,9 +1,5 @@ -{ stdenv -, buildPythonPackage -, ddt -, sqlalchemy +{ buildPythonPackage , stestr -, subunit2sql }: buildPythonPackage rec { From 23f7e1d054ff5d8c34b2bb0c81c711cf262b5822 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Nov 2021 16:23:38 +0100 Subject: [PATCH 38/57] python3Packages.pg8000: 1.22.1 -> 1.23.0 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 98750a917ca1..f61a0c593275 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.22.1"; + version = "1.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/WmtWvJ4HllgjLP02WayNNlhxi8JPt0xlKxF32W40dQ="; + sha256 = "sha256-pBPgAUE0KBOiykfot7BUn/M4zKAryBkHa21w8S11XHk="; }; propagatedBuildInputs = [ From 7c6bd2bc4597585e3bf26d65ad514cd2d663a07b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 13 Nov 2021 15:20:20 +0000 Subject: [PATCH 39/57] python3Packages.build: skip test failing on darwin --- pkgs/development/python-modules/build/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 9b02160dc4e0..70693133b52f 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , filelock @@ -56,6 +57,9 @@ buildPythonPackage rec { "test_default_pip_is_never_too_old" "test_build" "test_init" + ] ++ lib.optionals stdenv.isDarwin [ + # expects Apple's python and its quirks + "test_can_get_venv_paths_with_conflicting_default_scheme" ]; pythonImportsCheck = [ "build" ]; From 5419cf40465e8084860b5c66f80da5d06be1277a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 13 Nov 2021 10:55:00 -0500 Subject: [PATCH 40/57] bespokesynth: mark unfree Binaries of VST2 cannot be distributed without upstream permission which we don't have and cant get. Until VST2 support can be teased out more carefully, let's mark the package us unfree. --- pkgs/applications/audio/bespokesynth/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index c3c33267f65d..51d27224e315 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -106,7 +106,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://github.com/awwbees/BespokeSynth"; - license = licenses.gpl3Plus; + license = with licenses; [ + gpl3Plus + + # This package is unfree and not distributable due to the license of VST2. + # see #145607 + unfree + ]; maintainers = with maintainers; [ astro ]; platforms = platforms.all; }; From cacb8de58f3553470f84800390aff1fc616b625b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 13 Nov 2021 10:57:04 -0500 Subject: [PATCH 41/57] bespokesynth: fixup trailing whitespace --- pkgs/applications/audio/bespokesynth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 51d27224e315..e8d2ada38783 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/awwbees/BespokeSynth"; license = with licenses; [ gpl3Plus - + # This package is unfree and not distributable due to the license of VST2. # see #145607 unfree From df177cf39b6d9e1a10967079cb32970401d91a25 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 13 Nov 2021 17:49:46 +0100 Subject: [PATCH 42/57] domination: 1.2.3 -> 1.2.4 --- pkgs/games/domination/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 2fc4f8d36cb4..e73b563c0afa 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.3"; + version = "1.2.4"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "1964"; - sha256 = "0718gns8d69a1dfq3ywc9kddl1khnrmxqyal7brckbjgay8dq42f"; + rev = "2109"; + sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I="; }; nativeBuildInputs = [ @@ -44,7 +44,10 @@ in stdenv.mkDerivation { makeWrapper ]; - buildPhase = "ant"; + buildPhase = '' + cd swingUI + ant + ''; installPhase = '' # Remove unnecessary files and launchers (they'd need to be wrapped anyway) From 42ace190f762465381e88bf92d37b26fea5cbbeb Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sat, 13 Nov 2021 12:18:38 -0600 Subject: [PATCH 43/57] maintainers: add keys to legendofmiracles --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6851c32430b9..1427c2ac5a8d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6459,6 +6459,10 @@ github = "legendofmiracles"; githubId = 30902201; name = "legendofmiracles"; + keys = [{ + longkeyid = "rsa4096/0x19B082B3DEFE5451"; + fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; + }]; }; lejonet = { email = "daniel@kuehn.se"; From 60cee1103dc0ad7294ca862cfa3ecd14313c91ed Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 13 Nov 2021 19:28:56 +0100 Subject: [PATCH 44/57] Apply suggestions from code review --- pkgs/development/libraries/luabind/default.nix | 2 +- pkgs/development/libraries/nco/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index b36e6f34c826..67605dda51d9 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "luabind"; repo = "luabind"; - rev = "v${version}"; + rev = version; sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag="; }; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 7262d7f661c8..b90d64c2ffcb 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nco"; repo = "nco"; - rev = "${version}"; + rev = version; sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw="; }; From bbc5688e8f674aeeefd1070519bbe88c7bf63a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 13 Nov 2021 19:31:08 +0100 Subject: [PATCH 45/57] tree: fix cross-compile Should be makeFlagsArray not makeFlags --- pkgs/tools/system/tree/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 0b19bd576874..78341e968184 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |' - makeFlags+=("CC=$CC") + makeFlagsArray+=("CC=$CC") ''; makeFlags = [ From 792680167b2a0798e4a75d874e32d6ccc41ca213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Nov 2021 19:45:02 +0100 Subject: [PATCH 46/57] flex: delete unreferenced file --- pkgs/development/tools/parsing/flex/2.6.1.nix | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 pkgs/development/tools/parsing/flex/2.6.1.nix diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix deleted file mode 100644 index aeb141649772..000000000000 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, bison, m4 }: - -stdenv.mkDerivation { - name = "flex-2.6.1"; - - src = fetchurl { - url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz"; - sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw"; - }; - - postPatch = '' - patchShebangs tests - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace Makefile.in --replace "tests" " "; - ''; - - buildInputs = [ bison ]; - - propagatedBuildInputs = [ m4 ]; - - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - ac_cv_func_malloc_0_nonnull=yes - ac_cv_func_realloc_0_nonnull=yes - ''; - - postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' - sed -i Makefile -e 's/-no-undefined//;' - ''; - - meta = with lib; { - homepage = "https://github.com/westes/flex"; - description = "A fast lexical analyser generator"; - license = licenses.bsd2; - platforms = platforms.unix; - }; -} From dfc142b35ba66a6fc07ce051214da1a7138522e1 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Sat, 13 Nov 2021 20:42:33 +0100 Subject: [PATCH 47/57] wordpress: 5.8.1 -> 5.8.2 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index a06fdd4d4e98..32b63a25b0b4 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.8.1"; + version = "5.8.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-kMqQxK+jfa3IpHQ7XLERsgzaX5g84HPCwL69zmT6gio="; + sha256 = "sha256-o9KeTmZXTHtqa/Z2KOo1n6gVCFuna42dFrvf9OBC8v8="; }; installPhase = '' From 159b90f118b5c54e3cf86bd134916728958f8f38 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 13 Nov 2021 20:47:45 +0000 Subject: [PATCH 48/57] python3Packages.python-jenkins: skip test failing on darwin --- .../development/python-modules/python-jenkins/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 06a5d234ecf6..7c1d64fc827d 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , mock @@ -22,6 +23,13 @@ buildPythonPackage rec { sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy"; }; + # test uses timeout mechanism unsafe for use with the "spawn" + # multiprocessing backend used on macos + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace tests/test_jenkins_sockets.py \ + --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout + ''; + buildInputs = [ mock ]; propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; From 436874a70d9ea576be933ffebb39fcf41b75c5d4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Nov 2021 20:48:13 +0000 Subject: [PATCH 49/57] lifelines: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: screen.c:430:17: error: format not a string literal and no format arguments [-Werror=format-security] 430 | wprintw(win, _(qSdbrdonly)); | ^~~~~~~ --- pkgs/applications/misc/lifelines/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix index 50827355cac0..f7f6c5fa2a38 100644 --- a/pkgs/applications/misc/lifelines/default.nix +++ b/pkgs/applications/misc/lifelines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: stdenv.mkDerivation rec { pname = "lifelines"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/lifelines/lifelines/pull/437 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch"; + sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7"; + }) + ]; + buildInputs = [ gettext libiconv From d664b7e32701c6fe5a577f20ccbecf1132c34c0d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Nov 2021 21:05:37 +0000 Subject: [PATCH 50/57] tty-clock: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: ttyclock.c:270:71: error: format not a string literal and no format arguments [-Werror=format-security] 270 | mvwprintw(ttyclock.datewin, (DATEWINH / 2), 1, ttyclock.date.datestr); | ~~~~~~~~~~~~~^~~~~~~~ --- pkgs/tools/misc/tty-clock/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index b6cca5fe5c33..dc802a6fe0f8 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "tty-clock"; - version = "2.3"; + version = "2.3+unstable=2021-04-07"; src = fetchFromGitHub { owner = "xorg62"; repo = "tty-clock"; - rev = "v${version}"; - sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp"; + # Use unreleased version to pull in fix for ncurses-6.3 + rev = "9e00c32098524c30dac4dab701f7e33f8bc7c880"; + sha256 = "14jrzz06jr29887bxgad1x6kd26c2fnqrc26864wqm3838fpcqw0"; }; + patches = [ + # Pull upstream patch pending inclusion fir more ncurses-6.3 fixes: + # https://github.com/xorg62/tty-clock/pull/100 + (fetchpatch { + name = "ncurses-6.2.patch"; + url = "https://github.com/xorg62/tty-clock/commit/4cfd73080da1964557484da620c401745d73881c.patch"; + sha256 = "13pj1v6yrfc4vynsa746974kixfxxsy2jzzpl73c8bp7msr9d3md"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; From 3efa5631b2f4d6c359c34a9ccd3c2e77fb40c8e9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Nov 2021 21:12:08 +0000 Subject: [PATCH 51/57] nethogs: pull upstream fix for ncurses-6.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the fix build on ncurses-6.3 fails as: cui.cpp: In function ‘void show_ncurses(Line**, int)’: cui.cpp:377:73: error: format not a string literal and no format arguments [-Werror=format-security] 377 | mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, desc_view_mode[viewMode]); | ^ --- pkgs/tools/networking/nethogs/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 872e22a4f2ab..c26cb527f55e 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "nethogs"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; + patches = [ + # Pull upstream patch for ncurses-6.3 support: + # https://github.com/raboof/nethogs/pull/210 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch"; + sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs"; + }) + ]; + buildInputs = [ ncurses libpcap ]; makeFlags = [ "VERSION=${version}" "nethogs" ]; From fd9cbb1bed26fa9687c8ca0d7d57f586ee355d63 Mon Sep 17 00:00:00 2001 From: virchau13 Date: Sun, 14 Nov 2021 05:58:09 +0800 Subject: [PATCH 52/57] ckb-next: fix audio by adding libpulseaudio (#143023) Co-authored-by: Sandro --- pkgs/tools/misc/ckb-next/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 81e51bbbf20f..2566ee0a2e5f 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,5 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev -, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }: +{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv +, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu +, withPulseaudio ? stdenv.isLinux, libpulseaudio +}: mkDerivation rec { version = "0.4.4"; @@ -20,7 +22,7 @@ mkDerivation rec { qttools qtx11extras libdbusmenu - ]; + ] ++ lib.optional withPulseaudio libpulseaudio; nativeBuildInputs = [ pkg-config From df99f2326ee60ea5e44ecea403f92d98313e1a1f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 13 Nov 2021 23:00:20 +0100 Subject: [PATCH 53/57] nixosTests.domination: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/domination.nix | 26 ++++++++++++++++++++++++++ pkgs/games/domination/default.nix | 5 +++++ 3 files changed, 32 insertions(+) create mode 100644 nixos/tests/domination.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0ee91ebffbed..deed04697de5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -109,6 +109,7 @@ in docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; + domination = handleTest ./domination.nix {}; dovecot = handleTest ./dovecot.nix {}; ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; diff --git a/nixos/tests/domination.nix b/nixos/tests/domination.nix new file mode 100644 index 000000000000..c76d4ed8c61b --- /dev/null +++ b/nixos/tests/domination.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "domination"; + meta = with pkgs.lib.maintainers; { + maintainers = [ fgaz ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ pkgs.domination ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + machine.execute("domination >&2 &") + machine.wait_for_window("Menu") + machine.wait_for_text("New Game") + machine.screenshot("screen") + ''; +}) diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index e73b563c0afa..0dde8ab16413 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -6,6 +6,7 @@ , ant , makeWrapper , makeDesktopItem +, nixosTests }: let @@ -79,6 +80,10 @@ in stdenv.mkDerivation { install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png ''; + passthru.tests = { + domination-starts = nixosTests.domination; + }; + meta = with lib; { homepage = "http://domination.sourceforge.net/"; downloadPage = "http://domination.sourceforge.net/download.shtml"; From 87ca1442f995a87f364982150a15b0c671090ada Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 13 Nov 2021 20:02:48 +0000 Subject: [PATCH 54/57] trellis: fix build for darwin --- pkgs/development/embedded/fpga/trellis/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index 8c44e34e3ed1..2289b6fb6398 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -41,6 +41,12 @@ in stdenv.mkDerivation rec { cd libtrellis ''; + postInstall = lib.optionalString stdenv.isDarwin '' + for f in $out/bin/* ; do + install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f" + done + ''; + doInstallCheck = true; installCheckPhase = '' From b0249fdf998d782e1058b0cf3239091e59e393ef Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sat, 13 Nov 2021 22:06:21 +0100 Subject: [PATCH 55/57] pkgs.misc: remove unused args --- pkgs/misc/arm-trusted-firmware/default.nix | 2 +- pkgs/misc/drivers/hplip/3.16.11.nix | 2 +- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/misc/drivers/utsushi/default.nix | 2 +- pkgs/misc/emulators/commanderx16/run.nix | 4 +--- pkgs/misc/emulators/dgen-sdl/default.nix | 1 - pkgs/misc/emulators/mgba/default.nix | 1 - pkgs/misc/emulators/retroarch/cores.nix | 6 +++--- pkgs/misc/emulators/retroarch/default.nix | 1 - pkgs/misc/ghostscript/test-corpus-render.nix | 3 +-- pkgs/misc/scrcpy/default.nix | 1 - pkgs/misc/vscode-extensions/cpptools/default.nix | 3 +-- pkgs/misc/vscode-extensions/default.nix | 1 - pkgs/misc/vscode-extensions/wakatime/default.nix | 2 +- 14 files changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 49d27487bae7..60ddd621a05a 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, pkgsCross, buildPackages }: +{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }: let buildArmTrustedFirmware = { filesToInstall diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 37609a66c944..07a9f807772b 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -2,7 +2,7 @@ , pkg-config , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools -, bash, coreutils, util-linux +, bash, util-linux , qtSupport ? true , withPlugin ? false }: diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f33ca5024383..adfe889e02d9 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi -, bash, coreutils, util-linux +, bash, util-linux # To remove references to gcc-unwrapped , removeReferencesTo, qt5 , withQt5 ? true diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index ae3a083148ba..46a72fdd0dad 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config , autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends -, tesseract4, udev, libusb1, gnum4 }: +, tesseract4, udev, libusb1 }: let diff --git a/pkgs/misc/emulators/commanderx16/run.nix b/pkgs/misc/emulators/commanderx16/run.nix index cf14252b487c..1f14fdb223c7 100644 --- a/pkgs/misc/emulators/commanderx16/run.nix +++ b/pkgs/misc/emulators/commanderx16/run.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -, runtimeShell +{ runtimeShell , symlinkJoin , writeTextFile }: diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/misc/emulators/dgen-sdl/default.nix index 4a76ee0df026..e56ca12a4e96 100644 --- a/pkgs/misc/emulators/dgen-sdl/default.nix +++ b/pkgs/misc/emulators/dgen-sdl/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchurl , libarchive -, doxygen , SDL }: diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index c15c8a0ad76a..be0911aaab10 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -9,7 +9,6 @@ , libedit , libelf , libzip -, copyDesktopItems , makeDesktopItem , minizip , pkg-config diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index bddabede0a07..9b3db346e049 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch -, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch +, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, portaudio, SDL, SDL2, libGL , ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump -, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl +, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: let diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 86ca803d965a..f5db3d427f9e 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -14,7 +14,6 @@ , udev ? null , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , withVulkan ? stdenv.isLinux, vulkan-loader ? null -, fetchurl , wayland , libxkbcommon }: diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/misc/ghostscript/test-corpus-render.nix index 544392090ff7..97a2a834232c 100644 --- a/pkgs/misc/ghostscript/test-corpus-render.nix +++ b/pkgs/misc/ghostscript/test-corpus-render.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchgit , ghostscript }: diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 755d778e545e..4ffbee147158 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -2,7 +2,6 @@ , meson , ninja , pkg-config -, fetchpatch , platform-tools , ffmpeg diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 003846fb2c43..077c3807ecaa 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,6 +1,5 @@ { lib, vscode-utils -, fetchurl, unzip -, mono, writeScript, runtimeShell +, fetchurl, mono, writeScript, runtimeShell , jq, clang-tools , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 2da7d23e0af0..f1107d866cc2 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,6 +1,5 @@ { config , lib -, buildEnv , fetchurl , callPackage , vscode-utils diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index d902410190b4..9832b16f7473 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -1,5 +1,5 @@ { lib -, wakatime, vscode-utils }: +, vscode-utils }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; From 6604d111bea56432369eac1901c749ae9ceaf27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 13 Nov 2021 23:30:53 +0100 Subject: [PATCH 56/57] linuxPackages.rtl88xxau-aircrack: remove unused fetchpatch --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index cc8f4ed611f8..25dd61bc8a0b 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: let rev = "307d694076b056588c652c2bdaa543a89eb255d9"; From 3df74bdd3fd3f90d05bf321c22a59a9f319e0658 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 13 Nov 2021 00:29:51 -0600 Subject: [PATCH 57/57] kernel: enable core scheduling on 5.14+ kernels Core scheduling is a recent innovation in newer kernels to help run certain untrusted compute workloads more safely in the face of vulnerabilities like Spectre. In short: it lets processes assign a unique "cookie" to some group of processes to indicate they are allowed to be scheduled together on the same SMT-capable core. This helps mitigate attacks that rely on observing usage of CPU execution units by cohabitated threads. Some extra details are available via Linux Weekly News: "Core scheduling lands in 5.14", https://lwn.net/Articles/861251/ Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f591910f560b..62f0414987a0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -859,6 +859,8 @@ let LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ]; + SCHED_CORE = whenAtLeast "5.14" yes; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot