From 0565ee989e11dbfbff649a84b9719fc6c9b1405d Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Mon, 26 Oct 2020 03:22:18 +0100 Subject: [PATCH 01/28] nixos/plasma5: Install default KDE apps for music, images and documents >From https://apps.kde.org/: Elisa is a simple KDE music player (with builtin internet radio support), Okular is a universal KDE document viewer (can fill PDF forms), Gwenview is a fast and easy to use KDE image viewer. All three are missing in the default installation KDE installation, e.g. services.xserver = { displayManager.sddm.enable = true; desktopManager.plasma5.enable = true; }; which provides no alternatives, hence requiring them whilst being offline is unfortunate, so install them by default. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index ad0385ddeed2..4ba70f15be17 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -307,6 +307,10 @@ in qtvirtualkeyboard pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + + elisa + gwenview + okular ] # Phonon audio backend From 2a4d13f8da47dd6ee6eb331adaf96127ca37ae75 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 18 Sep 2021 09:41:27 +0000 Subject: [PATCH 02/28] plasma5Packages.ksysguard: remove if !allowAliases Usually in Nixpkgs, attributes that are remnants of old packages are only included when aliases are enabled (which they are by default). This brings plasma5Packages into line with that, and also makes it easier to check the whole thing evaluates when working on the package set. --- pkgs/desktops/plasma-5/default.nix | 8 ++++---- pkgs/top-level/qt5-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 7e1bb2b1092b..e5a239308886 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -24,9 +24,8 @@ existing packages here and modify it as necessary. */ -{ - libsForQt5, lib, fetchurl, - gconf, gsettings-desktop-schemas +{ libsForQt5, lib, config, fetchurl +, gconf, gsettings-desktop-schemas }: let @@ -123,7 +122,6 @@ let kscreen = callPackage ./kscreen.nix {}; kscreenlocker = callPackage ./kscreenlocker.nix {}; ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; ksystemstats = callPackage ./ksystemstats.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; @@ -164,6 +162,8 @@ let parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; }; + } // lib.optionalAttrs (config.allowAliases or true) { + ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index b98cbd083062..0c5cb6622359 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -29,7 +29,7 @@ let mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5; - inherit (pkgs) lib fetchurl; + inherit (pkgs) config lib fetchurl; gconf = pkgs.gnome2.GConf; inherit (pkgs) gsettings-desktop-schemas; }; From 654f41435bea857c1fa7837f4ade9f6a30d410f2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 25 Sep 2021 14:32:58 +0200 Subject: [PATCH 03/28] nixos/etc: simplify source path handling This change is strictly functionally equivalent because we're just lifting the transformation of `source` out of `mapAttrs` to the single point of use (in escapeShellArgs). This is also much faster because we can skip a map over all `etc` items. --- nixos/modules/system/etc/etc.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 84468ea31f74..80e728d09a64 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -6,9 +6,7 @@ with lib; let - # if the source is a local file, it should be imported to the store - localToStore = mapAttrs (name: value: if name == "source" then "${value}" else value); - etc' = map localToStore (filter (f: f.enable) (attrValues config.environment.etc)); + etc' = filter (f: f.enable) (attrValues config.environment.etc); etc = pkgs.runCommandLocal "etc" { # This is needed for the systemd module @@ -55,7 +53,8 @@ let mkdir -p "$out/etc" ${concatMapStringsSep "\n" (etcEntry: escapeShellArgs [ "makeEtcEntry" - etcEntry.source + # Force local source paths to be added to the store + "${etcEntry.source}" etcEntry.target etcEntry.mode etcEntry.user From f70860c9dcb7156f1cb81b45390cf71322f5da11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Sep 2021 16:50:39 -0700 Subject: [PATCH 04/28] python3Packages.rapidfuzz: 1.6.2 -> 1.7.0 https://github.com/maxbachmann/RapidFuzz/releases/tag/v1.7.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index d02c557027f3..27e79d9d157e 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.6.2"; + version = "1.7.0"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-tzjtvM5b9RD+Uqg5wT+FtSgjbAc0IgoDAmUFNpXQ9KA="; + sha256 = "sha256-vK2MnFdZOAO+0WNM20w2vz5Yh2buI+fl7teHQqwuiUk="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rapid fuzzy string matching"; - homepage = "https://github.com/maxbachmann/rapidfuzz"; + homepage = "https://github.com/maxbachmann/RapidFuzz"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 3b67f5520144d139c4b7e08cd09be8c8dc7cb4c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Sep 2021 04:38:08 +0000 Subject: [PATCH 05/28] python38Packages.google-cloud-bigtable: 2.3.3 -> 2.4.0 --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 5f61ac7f8830..747fdd07b041 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.3.3"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4rMnGnDQtuu55mzrYkeJjrU0ykQXd+pOYAw2yVcqJAQ="; + sha256 = "b8472c91b05159f20121fcca6ebdc2a3b5648d68158ec747860914279b6b983b"; }; propagatedBuildInputs = [ From 24f7f9d594c4083ae0be753d8a68f0d9ab2b8c1f Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Tue, 28 Sep 2021 18:44:44 +0300 Subject: [PATCH 06/28] python3Packages.pipx: 0.16.3 -> 0.16.5 --- pkgs/development/python-modules/pipx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index c49601786732..86091820a1dc 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.16.3"; + version = "0.16.5"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c"; + sha256 = "sha256-gBeaHEig47XWKoPx3jzvgk/jJPJXtr5R5qUL0LgvbDg="; }; propagatedBuildInputs = [ From 9db14723ded093c2fb60c6e39ebb3bd479ae0c8f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Sep 2021 16:10:52 +0000 Subject: [PATCH 07/28] python38Packages.sagemaker: 2.57.0 -> 2.59.4 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 23fa728a78a0..6d32422fa09a 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.57.0"; + version = "2.59.4"; src = fetchPypi { inherit pname version; - sha256 = "b03b340fe54f91b0533d3ce19d5b7fdf403da21b5befab70a9915466e48f6e75"; + sha256 = "16b325966c1a05413994831ff29e3c7656a4be947a7771541af5935b1d01c024"; }; pythonImportsCheck = [ From 357a548c122a46e55f2e30a21687c776ff1f6354 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 02:14:26 +0000 Subject: [PATCH 08/28] python38Packages.casbin: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index a83574629fe0..dc31600f9475 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.9.1"; + version = "1.9.2"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0pwaqajwxkb8c7rnb6cvpz877azs13f1mdq33z5gp2v09fj8s2b0"; + sha256 = "0awqdh4jsarf0lr2bl2qiaff1yk9vndq15jcl4abiig9wr2yghpc"; }; propagatedBuildInputs = [ From 22f86132177b7eac7614a73eda8613b18c41b276 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Sep 2021 03:34:20 +0000 Subject: [PATCH 09/28] python38Packages.cornice: 5.2.0 -> 6.0.0 --- pkgs/development/python-modules/cornice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 5a576f3e6c45..793db7d5e4e4 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "5.2.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "50f86a5e9fb73d664d20e8dd0bdc3ce419145eb17813591a5a40e8a9d567b9c5"; + sha256 = "532485ed53cae81ef476aaf4cc7c2e0208749ad1959119c46efefdeea5546eba"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; From a30041c1a4a6299148614ad73e601b147a32b4d2 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 30 Sep 2021 18:34:07 -0400 Subject: [PATCH 10/28] python3Packages.collections-extended: init at 2.0.0 --- .../collections-extended/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/collections-extended/default.nix diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix new file mode 100644 index 000000000000..52f73a5554a5 --- /dev/null +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +}: +buildPythonPackage rec { + pname = "collections-extended"; + version = "2.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mlenzen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256:1qcr1q49a134b122rpldjiim1fsl32gxs5fpj3232nyb05r68haz"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "collections_extended" ]; + + meta = with lib; { + homepage = "https://github.com/mlenzen/collections-extended"; + description = "Extra Python Collections - bags (multisets), setlists (unique list / indexed set), RangeMap and IndexedDict"; + license = licenses.asl20; + maintainers = with maintainers; [ exarkun ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2139082ae59f..06a56e679d13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1611,6 +1611,8 @@ in { colander = callPackage ../development/python-modules/colander { }; + collections-extended = callPackage ../development/python-modules/collections-extended { }; + colorama = callPackage ../development/python-modules/colorama { }; colorcet = callPackage ../development/python-modules/colorcet { }; From 3b8e97b4f721ef14846c43df4c82143977113156 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 2 Oct 2021 02:00:50 +0300 Subject: [PATCH 11/28] libdecor: init at 0.1.0 --- .../libraries/libdecor/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/libdecor/default.nix diff --git a/pkgs/development/libraries/libdecor/default.nix b/pkgs/development/libraries/libdecor/default.nix new file mode 100644 index 000000000000..044f7c91b00c --- /dev/null +++ b/pkgs/development/libraries/libdecor/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitLab +, pkg-config +, meson +, ninja +, wayland +, wayland-protocols +, cairo +, dbus +, pango +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "libdecor"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "jadahl"; + repo = "libdecor"; + rev = "${version}"; + hash = "sha256:0qdg3r7k086wzszr969s0ljlqdvfqm31zpl8p5h397bw076zr6p2"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + wayland + wayland-protocols + cairo + dbus + pango + libxkbcommon + ]; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/jadahl/libdecor"; + description = "Client-side decorations library for Wayland clients"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a4d06d73eb5..ae59a00082bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16959,6 +16959,8 @@ with pkgs; libGL = null; }; + libdecor = callPackage ../development/libraries/libdecor { }; + libdigidoc = callPackage ../development/libraries/libdigidoc { inherit (darwin.apple_sdk.frameworks) Security; }; From 4807351d123543270d90da5a1100afd294ee9020 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 2 Oct 2021 06:41:19 +0300 Subject: [PATCH 12/28] obs-studio: fix doublewrapping --- pkgs/applications/video/obs-studio/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 1d226ec8fe26..85a072547714 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -121,10 +121,9 @@ mkDerivation rec { "-DCEF_ROOT_DIR=../../cef" ]; - postInstall = '' - wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" - ''; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" + ]; postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so From bb07abf44d3573aa865a0f7612bbb149810b53e8 Mon Sep 17 00:00:00 2001 From: ckie Date: Sat, 2 Oct 2021 14:27:29 +0300 Subject: [PATCH 13/28] headscale: 0.8.1 -> 0.9.2 --- pkgs/servers/headscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 1b95ee18085b..c863115afb7e 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-xNsdq8qcf2V+OQkRPBVys8SiusFoahezzQet19dYqlw="; + sha256 = "sha256-1YxcfSOGGdyUZyQdKSHUiK5/43Ki/QvHvIZ/Ai5Mq7E="; }; - vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; + vendorSha256 = "sha256-LJajQDk+r9Wt2t/kwNhsCoSlU+EjSNc1WT2vqtqg4LI="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile From a77c1b39b8409833998b3ff65859ccfa3e3bd592 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Sat, 2 Oct 2021 17:43:22 +0200 Subject: [PATCH 14/28] step-ca: 0.16.2 -> 0.17.4 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 85501ff18e6e..f99e1fe74db8 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.16.2"; + version = "0.17.4"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-JDoiz/BX8zB+qdwlGPUCa30R+pwWWtjEiXHP5LxdPAE="; + sha256 = "sha256-X4dOrd/wxtYLw3C4Lj88RV/J6CEkmsOeqtiVX/6VFHg="; }; - vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI="; + vendorSha256 = "sha256-/8Glo+U8MS8Y8mKECgTAB7JWmp/rjMQhG4nZkNs+Zgs="; ldflags = [ "-buildid=" ]; From b2092aae6f4cc85fe70d2f486e1211f038d50b8c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 2 Oct 2021 17:50:36 +0200 Subject: [PATCH 15/28] drawpile: 2.1.19 -> 2.1.20 --- pkgs/applications/graphics/drawpile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index fb5308921d4e..09d51db254ba 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -68,13 +68,13 @@ let in mkDerivation rec { pname = "drawpile"; - version = "2.1.19"; + version = "2.1.20"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-MNmzcqTHfMms6q3ZilrChE5WoGzGxnAOkB0a75udA1I="; + sha256 = "sha256-HjGsaa2BYRNxaQP9e8Z7BkVlIKByC/ta92boGbYHRWQ="; }; nativeBuildInputs = [ extra-cmake-modules ]; From e90cfad2bed9fd215be46e05316ab2e851a828d4 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 3 Oct 2021 00:24:11 +0800 Subject: [PATCH 16/28] yaru-theme: 21.10.1 -> 21.10.2 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 05ddd5ad15d9..64bd3eb5eebc 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "21.10.1"; + version = "21.10.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-VcuH/lEnSeOYGFXr3OPw9PRUwHOVx4RjUQXblv6jdD8="; + sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From 82b6455cc222d540c8ce7a2995c1b2d165299d69 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 2 Oct 2021 20:16:33 +0300 Subject: [PATCH 17/28] cups-filters: define mutool path and localstatedir,sysconfdir --- pkgs/misc/cups/filters.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 911892cb728e..98f5880f8995 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; configureFlags = [ - # TODO(Profpatsch): mupdf support + "--with-mutool-path=${mupdf}/bin/mutool" "--with-pdftops=pdftops" "--with-pdftops-path=${poppler_utils}/bin/pdftops" "--with-gs-path=${ghostscript}/bin/gs" @@ -35,6 +35,8 @@ in stdenv.mkDerivation rec { "--with-rcdir=no" "--with-shell=${stdenv.shell}" "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" + "--localstatedir=/var" + "--sysconfdir=/etc" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; From 805cb8341840e06a6a127fc013ac6a1798032717 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 2 Oct 2021 19:55:12 +0200 Subject: [PATCH 18/28] tailscale: 1.14.4 -> 1.14.6 https://github.com/tailscale/tailscale/releases/tag/v1.14.6 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 67e18f104d74..85f292711ef4 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.14.4"; + version = "1.14.6"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8="; + sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-em6443czDMak9RxLq7Dj9miknqg29vf0a0N82LmNrHk="; + vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o="; doCheck = false; From c7d875af1cce073d4bac487ae43a9c83663db073 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 2 Oct 2021 07:57:57 +0300 Subject: [PATCH 19/28] gnome.gnome-tweaks: patch python script in libexec --- pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 460ab47733ca..c220e7eeccd1 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -64,6 +64,16 @@ python3Packages.buildPythonApplication rec { patchShebangs meson-postinstall.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From e417cc7156a5e00909d7360037f3940d91569515 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Oct 2021 20:50:02 +0200 Subject: [PATCH 20/28] python3Packages.nettigo-air-monitor: 1.0.0 -> 1.1.0 --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 4787d9d6f768..914fd4fa2568 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-VTKIUo3rR/HyEW/d/Nm0fm7wbgSdLGf02i8R3om1oCE="; + sha256 = "sha256-YfRPfOJ0uEBounRMSUHcjNASLBqEwS2nVJKbsfrSpGQ="; }; propagatedBuildInputs = [ From faf57c8e3a35eaf155fa2c7dcfeb7a0ed2fb3f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= <645664+p-h@users.noreply.github.com> Date: Sat, 2 Oct 2021 19:31:17 +0000 Subject: [PATCH 21/28] analog: Fix substitution so it can find its language files (#133540) --- pkgs/tools/admin/analog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 3d8556d81032..f3318eb55077 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ - -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" + -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g" substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" ''; From 642eb3f64179dfce0789823d14cbee8f390e329e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Oct 2021 21:51:51 +0200 Subject: [PATCH 22/28] goaccess: 1.5.1 -> 1.5.2 --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 051e61e7af81..008c9b59397f 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.5.2"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "sha256-iEF+eOYrcN45gLdiKRHk/NcZw2YPADyIeWjnGWw5lw8="; + sha256 = "sha256-oM4vk5OyYiSE5GnpWoCd/VKt5NQgBJHkPt4fy1KrHIo="; }; configureFlags = [ From b4ba29173d06674a764a666c358bfa5d3b1e3983 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Oct 2021 22:30:11 +0200 Subject: [PATCH 23/28] python3Packages.nunavut: fix build --- pkgs/development/python-modules/nunavut/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index c628abad8691..10ac5ae722ca 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -3,12 +3,14 @@ , pythonOlder , fetchPypi , pydsdl +, pyyaml }: buildPythonPackage rec { pname = "nunavut"; version = "1.4.2"; - disabled = pythonOlder "3.5"; # only python>=3.5 is supported + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -17,6 +19,7 @@ propagatedBuildInputs = [ pydsdl + pyyaml ]; # allow for writable directory for darwin From ac2a0f27573ebf76f3aaa5b16c027f3cf98aa839 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Oct 2021 22:45:21 +0200 Subject: [PATCH 24/28] python3Packages.ocrmypdf: set version manually --- pkgs/development/python-modules/ocrmypdf/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 531e042c5b95..36f8d1d1281f 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + patches = [ (substituteAll { src = ./paths.patch; @@ -73,6 +75,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "ocrmypdf" + ]; + meta = with lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; From 0219679ed0d2325e5c828e1ef16ad4a5c7cfdb2e Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sat, 2 Oct 2021 20:36:09 +0100 Subject: [PATCH 25/28] mpvScripts.mpv-playlistmanager: unstable-2021-08-17 -> unstable-2021-09-27 --- pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 0b750332ea7f..a1179ef7aa3a 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpv-playlistmanager"; - version = "unstable-2021-08-17"; + version = "unstable-2021-09-27"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "44d6911856a39e9a4057d19b70f21a9bc18bd6a9"; - sha256 = "IwH6XngfrZlKGDab/ut43hzHeino8DmWzWRX8Av21Sk="; + rev = "9a759b300c92b55e82be5824fe058e263975741a"; + sha256 = "qMzDJlouBptwyNdw2ag4VKEtmkQNUlos0USPerBAV/s="; }; postPatch = '' From 4766e365d34b7a9925b79f19e5e1bfe691b72294 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 3 Oct 2021 03:39:15 +0530 Subject: [PATCH 26/28] cni-plugin-flannel: 1.0 -> 1.1 https://github.com/flannel-io/cni-plugin/releases/tag/v1.1 --- pkgs/tools/networking/flannel/plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index 40d0fa9ecc55..51e29a31ddc5 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-s2gibebXTqM/12nDHwc89geWxA6gZi9/if5VnUFoTDE="; + sha256 = "sha256-DZC6uJR6TIHdmu8kZcbM+RC7pdejqLCOep0v3PM8/QY="; }; vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; From e18f0df44bce45e39c3db7e0916b56e215ee273a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 3 Oct 2021 00:31:15 +0200 Subject: [PATCH 27/28] sonarr: 3.0.6.1266 -> 3.0.6.1342 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 49a176e0086a..a2d6d94d3b59 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.6.1266"; + version = "3.0.6.1342"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "2YkzmPxJLYClNQnGgheXI8y42ZXAHZUqEpmQ+b2mpfY="; + sha256 = "sha256-6RMthsf60FJLDHB72QJkPeF7vXmjBgcqKujO0IOjVIk="; }; nativeBuildInputs = [ makeWrapper ]; From a4df6db57dd68f7d5dad5dd56aadae57327048d2 Mon Sep 17 00:00:00 2001 From: milahu Date: Sun, 3 Oct 2021 00:37:35 +0200 Subject: [PATCH 28/28] rpl: update to 4467bd4 (#140161) * rpl: update to 1.10 Changes upstream as discussed in https://github.com/kcoyner/rpl/issues/7 - manpage missing because of a missing python package. --- pkgs/tools/text/rpl/default.nix | 33 +++++++++++++++---- .../text/rpl/remove-argparse-manpage.diff | 27 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 pkgs/tools/text/rpl/remove-argparse-manpage.diff diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index 97a30211621c..ee2fcd72ca9a 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -1,22 +1,41 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { +let + rev = "4467bd46a7a798f738247a7f090c1505176bd597"; + sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w"; +in + +python3Packages.buildPythonApplication rec { pname = "rpl"; - version = "1.5.7"; + version = "1.10"; # Tests not included in pip package. doCheck = false; + src = fetchFromGitHub { - owner = "kcoyner"; + owner = "rrthomas"; repo = "rpl"; - rev = "v${version}"; - sha256 = "1xhpgcmq91ivy9ijfyz5ilg51m7fz8ar2077r7gq246j8gbf8ggr"; + inherit rev sha256; }; + patches = [ + ./remove-argparse-manpage.diff # quickfix for ImportError: No module named build_manpages.build_manpages + ]; + + buildInputs = [ + #python3Packages.argparse-manpage # TODO + python3Packages.chardet + ]; + + installPhase = '' + mkdir -p $out/bin + mv rpl $out/bin + ''; + meta = with lib; { description = "Replace strings in files"; - homepage = "https://github.com/kcoyner/rpl"; + homepage = "https://github.com/rrthomas/rpl"; license = licenses.gpl2; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/tools/text/rpl/remove-argparse-manpage.diff b/pkgs/tools/text/rpl/remove-argparse-manpage.diff new file mode 100644 index 000000000000..8d3297699682 --- /dev/null +++ b/pkgs/tools/text/rpl/remove-argparse-manpage.diff @@ -0,0 +1,27 @@ +diff --git a/setup.cfg b/setup.cfg +index 12e9198..38e5376 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -15,7 +15,6 @@ classifiers = + [options] + scripts = rpl + python_requires = >=3 +-setup_requires = argparse-manpage + install_requires = chardet + + [options.extras_require] +diff --git a/setup.py b/setup.py +index 96cade6..879fc44 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,9 +1,8 @@ +-from build_manpages.build_manpages import get_install_cmd + from setuptools import setup + from setuptools.command.install import install + + setup( + cmdclass={ +- 'install': get_install_cmd(install), ++ 'install': install, + } + ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8cb714fa7b2..d18d668f5748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32109,9 +32109,7 @@ with pkgs; inherit glib gtk3 gobject-introspection wrapGAppsHook; }; - rpl = callPackage ../tools/text/rpl { - pythonPackages = python3Packages; - }; + rpl = callPackage ../tools/text/rpl { }; ricty = callPackage ../data/fonts/ricty { };