From 994c6e6e4d84db8f2fddc7d9a79bdf555ac5ca7c Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 3 Sep 2021 15:12:14 +0800 Subject: [PATCH 01/10] river, kile-wl: update --- pkgs/applications/misc/kile-wl/default.nix | 8 ++++---- pkgs/applications/window-managers/river/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 03786a629975..f517bfe3f4c1 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-08-03"; + version = "unstable-2021-09-02"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "7f0b1578352d935084d3d56ef42487d2a8cfbfe8"; - sha256 = "sha256-Ir9LNQt7/7TjhCJ69HYx1tBXeq/i7F3ydmenvchZgDI="; + rev = "acd61f7e59cc34091c976b0cdc3067dd35b53cae"; + sha256 = "sha256-O5sdPw9tR3GFPmJmb/QDmdBc7yeSGui4k+yn4Xo016A="; }; passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-195rPxX3BTxJ0xLgye14aWuBd5OuJ30wyUa4wrbQ3Xo="; + cargoSha256 = "sha256-2QCv5fk0AH4sv0QJ/16zniHfg3HZLoHB7dl6vSfkxpE="; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 5c809097ee17..24acb2664e5d 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-08-03"; + version = "unstable-2021-08-19"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "2fc0875a3e17a0328d14d0c6323bd8022d5b15de"; - sha256 = "sha256-Cs9RRubxy0DY6ILRZY36HtcoqBvzbN7NEfpREq1KBBQ="; + rev = "e59c2a73d72853cb54f55eecc446f337c94cda24"; + sha256 = "sha256-R/Wg8KLh4v3ccX1Uh0Q+7026tRH7XLxHpX9/BgsGGdA="; fetchSubmodules = true; }; From 4f79e1bbabfcab9f347379d55d2e5433d1d0f24a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Sep 2021 06:24:34 +0000 Subject: [PATCH 02/10] flow: 0.160.0 -> 0.160.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ee4e6d733fc5..4572ede05367 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.160.0"; + version = "0.160.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-pgNxiNzL7Mb/ueBhWBtUi4BGnLnemk3o05K/fqXWE6Q="; + sha256 = "sha256-tIKQBJ+nlUzY3+jHlXOAMfCLVJfRXZiveSkKaDMz/hI="; }; installPhase = '' From 65605178bffcf2f6afb761ac3df427b812a6887f Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Fri, 24 Sep 2021 21:12:08 +0200 Subject: [PATCH 03/10] pass-git-helper: 1.1.1 -> 1.1.2 --- .../git-and-tools/pass-git-helper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 1821dba0f006..a431a50af3b7 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs="; + sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI="; }; propagatedBuildInputs = [ pyxdg ]; @@ -21,6 +21,6 @@ buildPythonApplication rec { homepage = "https://github.com/languitar/pass-git-helper"; description = "A git credential helper interfacing with pass, the standard unix password manager"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vanzef ]; + maintainers = with maintainers; [ hmenke vanzef ]; }; } From 7ba89a2e22ebd4c0aa014ae21982c32f8020f6ec Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 25 Sep 2021 18:12:51 -0700 Subject: [PATCH 04/10] python3Packages.tensorflow-bin: remove nvidia_x11 reference the nvidia driver should be picked up from /run/opengl-driver/lib (and is, since we're already using addOpenGLRunpath) --- pkgs/development/libraries/science/math/tensorflow/bin.nix | 4 ++-- pkgs/development/python-modules/tensorflow/bin.nix | 5 +---- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index d42026c13cf9..b57d1191933b 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , addOpenGLRunpath -, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 +, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn }: with lib; @@ -17,7 +17,7 @@ let platform = "x86_64"; rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] - ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]); packages = import ./binary-hashes.nix; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index f5960f0e29ec..8d8690d3e5c5 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -23,7 +23,6 @@ , cudaSupport ? false , cudatoolkit ? null , cudnn ? null -, nvidia_x11 ? null , zlib , python , symlinkJoin @@ -41,8 +40,7 @@ # - the source build is currently brittle and not easy to maintain assert cudaSupport -> cudatoolkit != null - && cudnn != null - && nvidia_x11 != null; + && cudnn != null; # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); @@ -126,7 +124,6 @@ in buildPythonPackage { cudatoolkit.out cudatoolkit.lib cudnn - nvidia_x11 ]; libpaths = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffec1ea5c52f..2608e6b7f3b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2058,7 +2058,6 @@ with pkgs; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { cudaSupport = config.cudaSupport or false; - inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_10_0; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d95c5ff5414..ad4e76023250 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8831,7 +8831,6 @@ in { tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; cudatoolkit = pkgs.cudatoolkit_11_0; cudnn = pkgs.cudnn_cudatoolkit_11_0; }; From b5e86fa70094de98d721f7f32f60fa31157b066a Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 26 Sep 2021 12:48:56 -0700 Subject: [PATCH 05/10] firestarter: don't reference nvidia_x11 directly It should instead be picked up at runtime from /run/opengl-driver/lib, via addOpenGLRunpath --- .../applications/misc/firestarter/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index b2ca9a0cab62..92c517835d83 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , fetchzip +, addOpenGLRunpath , cmake , glibc_multi , glibc @@ -9,7 +10,6 @@ , pkg-config , cudatoolkit , withCuda ? false -, linuxPackages }: let @@ -60,13 +60,23 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake git pkg-config ]; + nativeBuildInputs = [ + cmake + git + pkg-config + ] ++ lib.optionals withCuda [ + addOpenGLRunpath + ]; buildInputs = [ hwloc ] ++ (if withCuda then - [ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ] + [ glibc_multi cudatoolkit ] else [ glibc.static ]); + NIX_LDFLAGS = lib.optionals withCuda [ + "-L${cudatoolkit}/lib/stubs" + ]; + cmakeFlags = [ "-DFIRESTARTER_BUILD_HWLOC=OFF" "-DCMAKE_C_COMPILER_WORKS=1" @@ -76,8 +86,14 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/ + runHook postInstall + ''; + + postFixup = lib.optionalString withCuda '' + addOpenGLRunpath $out/bin/FIRESTARTER_CUDA ''; meta = with lib; { From 365413e22fc68bb7e7695f29b21dd3fd7d3bf3f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Sep 2021 00:26:30 +0000 Subject: [PATCH 06/10] catcli: 0.7.2 -> 0.7.3 --- pkgs/tools/filesystems/catcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index b945198e01aa..ac2f856c3c0c 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "12928pvwd6jr4x81nxi5691axianm4vz5gql1jazlij0ahc2f905"; + sha256 = "03yf9sjqdg3xcbvkn1591zxd2d0r8wz1b749zrn55k3a03c7jzf5"; }; propagatedBuildInputs = [ docopt anytree ]; From aed860f87662825abdad405b0b5008013e42d042 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Sep 2021 15:02:06 +0800 Subject: [PATCH 07/10] nixos/zoneminder: not using zoneminder any longer --- nixos/modules/services/misc/zoneminder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index d9d34b7fac9b..378da7b87442 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -366,5 +366,5 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ peterhoeg ]; + meta.maintainers = with lib.maintainers; [ ]; } From 35dbdedf6337ffe6a003990697b114bea728b11a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Sep 2021 15:02:19 +0800 Subject: [PATCH 08/10] vala: not using vala --- pkgs/development/compilers/vala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 809e81ae548b..013b024f3bce 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,7 +100,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ] ++ teams.pantheon.members; + maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members; }; }); From 35cad8da44b44a174798e19d03b81bd995ac5de0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Sep 2021 15:52:43 +0800 Subject: [PATCH 09/10] heroku: remove peterhoeg as maintainer --- pkgs/development/tools/heroku/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 18a031cd23b0..205cf4e33db5 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://devcenter.heroku.com/articles/heroku-cli"; description = "Everything you need to get started using Heroku"; - maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg marsam ]; + maintainers = with lib.maintainers; [ aflatter mirdhyn marsam ]; license = lib.licenses.mit; platforms = with lib.platforms; unix; }; From dc72e18d5f34b3605ae9d7996984eaab239ef460 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 26 Sep 2021 15:52:54 +0800 Subject: [PATCH 10/10] quaternion: 0.0.9.5-beta2 -> 0.0.95 --- .../instant-messengers/quaternion/default.nix | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 31b37fc2dfb2..359c0fa7aac5 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,17 +1,27 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake -, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools -, libquotient, libsecret +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, qtquickcontrols +, qtquickcontrols2 +, qtkeychain +, qtmultimedia +, qttools +, libquotient +, libsecret }: mkDerivation rec { pname = "quaternion"; - version = "0.0.9.5-beta2"; + version = "0.0.95"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = version; - sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; + sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8="; }; buildInputs = [ @@ -26,14 +36,15 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; - postInstall = if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv $out/bin/quaternion.app $out/Applications - rmdir $out/bin || : - '' else '' - substituteInPlace $out/share/applications/com.github.quaternion.desktop \ - --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" - ''; + postInstall = + if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/quaternion.app $out/Applications + rmdir $out/bin || : + '' else '' + substituteInPlace $out/share/applications/com.github.quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + ''; meta = with lib; { description =