From e377a4d31291cce150f91e611c0a56b26d597cd4 Mon Sep 17 00:00:00 2001 From: Tobias Bergkvist Date: Tue, 22 Feb 2022 01:12:57 +0100 Subject: [PATCH 01/26] ruby-modules/bundler-env: Replace makeWrapper with makeBinaryWrapper to make bundled ruby apps work on macOS --- pkgs/development/ruby-modules/bundled-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 6a4a87bc8963..d06073b21bea 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, ruby, lib, rsync , defaultGemConfig, buildRubyGem, buildEnv -, makeWrapper +, makeBinaryWrapper , bundler }@defs: @@ -118,7 +118,7 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; inherit (ruby) gemPath meta; buildCommand = '' mkdir -p $out/bin From 068053ea4b68845ef5110759024d19f5c426b0f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Mar 2022 13:42:38 +0000 Subject: [PATCH 02/26] php74Packages.phing: 2.17.1 -> 2.17.2 --- pkgs/development/php-packages/phing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index 0b2e5ff8c589..a8835241d098 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phing"; - version = "2.17.1"; + version = "2.17.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://www.phing.info/get/phing-${version}.phar"; - sha256 = "sha256-Sf2fdy9b1wmXEDA3S4CRksH/DhAIirIy6oekWE1TNjE="; + sha256 = "sha256-KDqJdHIqgtar6ofNG4ENRlpRg9XYFeL5YS7Rclh1+PQ="; }; dontUnpack = true; From d06e5ddb33e351f5ada900dfce15bbeb38e28a61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 19:55:42 +0100 Subject: [PATCH 03/26] PULL_REQUEST_TEMPLATE: move call-for-review to the end This improves URL previews like the ones on Discourse, where currently the boilerplate comment is printed for every PR link instead of parts of the motivation. --- .github/PULL_REQUEST_TEMPLATE.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 91d61aef23b2..397e5ff5d175 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,3 @@ - - ###### Description of changes From 0730df1a1a1d4e4caa26bba9988b18ca3e322a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Mar 2022 13:25:39 +0100 Subject: [PATCH 04/26] nix: disable big-parallel for aws-sdk-cpp aws-sdk-cpp only takes ~1m52s on a 4 core machine under 50% load which does not justify the requirement on big parallel. Tested with `nix-build -A nixVersions.nix_2_6.aws-sdk-cpp`. --- pkgs/tools/package-management/nix/common.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 842ef5de3285..55d2e0b54059 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation { }; passthru = { - inherit boehmgc; + inherit aws-sdk-cpp boehmgc; perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { inherit src version; }); }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e080a57dc658..78fe76e2bce2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -24,6 +24,9 @@ let customMemoryManagement = false; }).overrideDerivation (args: { patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ]; + + # only a stripped down version is build which takes a lot less resources to build + requiredSystemFeatures = null; }); common = args: From 5c924dc3b9a51b4b45b0c6e9e775b5ae5c4ff3f2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 9 Mar 2022 13:15:28 +0100 Subject: [PATCH 05/26] nix-output-monitor: Add zsh completion for nom-build --- pkgs/tools/nix/nix-output-monitor/default.nix | 8 ++++++++ pkgs/tools/nix/nix-output-monitor/update.sh | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 214a25b36803..caa9abb9a1d6 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -16,6 +16,7 @@ filepath, generic-optics, HUnit, + installShellFiles, lib, lock-file, MemoTrie, @@ -140,11 +141,18 @@ mkDerivation { maintainers = with lib.maintainers; [maralorn]; passthru.updateScript = ./update.sh; testTarget = "unit-tests"; + buildTools = [installShellFiles]; postInstall = '' cat > $out/bin/nom-build << EOF #!${runtimeShell} ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom EOF chmod a+x $out/bin/nom-build + installShellCompletion --zsh --name _nom-build ${ + builtins.toFile "completion.zsh" '' + #compdef nom-build + compdef nom-build=nix-build + '' + } ''; } diff --git a/pkgs/tools/nix/nix-output-monitor/update.sh b/pkgs/tools/nix/nix-output-monitor/update.sh index 938736e91942..ad5da0000300 100755 --- a/pkgs/tools/nix/nix-output-monitor/update.sh +++ b/pkgs/tools/nix/nix-output-monitor/update.sh @@ -21,16 +21,29 @@ cat > "$derivation_file" << EOF # This file has been autogenerate with cabal2nix. # Update via ./update.sh" EOF -cabal2nix --extra-arguments expect --extra-arguments runtimeShell --maintainer maralorn "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" | head -n-1 >> "$derivation_file" + +cabal2nix \ + --extra-arguments expect \ + --extra-arguments runtimeShell\ + --extra-arguments installShellFiles\ + --maintainer maralorn \ + "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" \ + | head -n-1 >> "$derivation_file" + cat >> "$derivation_file" << EOF passthru.updateScript = ./update.sh; testTarget = "unit-tests"; + buildTools = [ installShellFiles ]; postInstall = '' cat > \$out/bin/nom-build << EOF #!\${runtimeShell} \${expect}/bin/unbuffer nix-build "\\\$@" 2>&1 | exec \$out/bin/nom EOF chmod a+x \$out/bin/nom-build + installShellCompletion --zsh --name _nom-build \${builtins.toFile "completion.zsh" '' + #compdef nom-build + compdef nom-build=nix-build + ''} ''; } EOF From fda06fe20ec07f0229fd9ace8d62bdc2bb4ac572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 13:47:34 +0000 Subject: [PATCH 06/26] php74Packages.phpstan: 1.4.7 -> 1.4.8 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 9f8a5feb8a74..41840f5ba9e8 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.4.7"; + version = "1.4.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-bsSdFfUVQnbDFH8hO1Z9sHA2w7pMHlLEx1hsgDdCUmE="; + sha256 = "sha256-ghXyPo9n2oXAz7BvuvBYjyJnUqf/FvNk8nTPIRv19cw="; }; dontUnpack = true; From 236a731da065014c4fb314566d31bf96da4ae759 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 9 Mar 2022 14:47:20 +0100 Subject: [PATCH 07/26] nixos/tor: admit newlines in secret key --- nixos/modules/services/security/tor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index cafb44e12429..3bf70c4aa4fc 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -962,7 +962,7 @@ in '') onion.authorizedClients ++ optional (onion.secretKey != null) '' install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} - key="$(cut -f1 -d: ${escapeShellArg onion.secretKey})" + key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)" case "$key" in ("== ed25519v"*"-secret") install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;; From a734cbbd5d1faf3c6139565a418b5a7f70a9b315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Mar 2022 16:13:59 +0100 Subject: [PATCH 08/26] wrappedRuby: add test for binaryWrapper --- .../ruby-modules/bundled-common/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index d06073b21bea..7bad0b442da6 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -118,9 +118,12 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; + nativeBuildInputs = [ makeBinaryWrapper ]; - inherit (ruby) gemPath meta; - buildCommand = '' + + dontUnpack = true; + + buildPhase = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ @@ -131,6 +134,15 @@ let --set GEM_PATH ${basicEnv}/${ruby.gemPath} done ''; + + dontInstall = true; + + doCheck = true; + checkPhase = '' + $out/bin/ruby --help > /dev/null + ''; + + inherit (ruby) meta; }; env = let From 7583acafd52334b6058d2ac40ef10fd4f91b67ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 15:21:58 +0000 Subject: [PATCH 09/26] php74Packages.php-cs-fixer: 3.6.0 -> 3.7.0 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index bf1c806dfc38..292d0b2ca08f 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.6.0"; + version = "3.7.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-sbz8uq6nJ6dEL6FHJ01VTrovaJa8bwQ9Ic+dLr7yPnA="; + sha256 = "sha256-a7mKM++0iQm9hQFCDfyR6Jdb9h98YNHmbdQso8BU3WE="; }; dontUnpack = true; From 4f81c2a1b7b8cc9849bd53195a2341359c069a01 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Mar 2022 19:11:38 +0300 Subject: [PATCH 10/26] treewide: more `makeDesktopItem` cleanups Somehow missed those on the first pass --- pkgs/tools/graphics/agi/default.nix | 2 +- pkgs/tools/graphics/snapdragon-profiler/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index aefa2c3f7897..1dc47e4287a2 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { desktopItems = [(makeDesktopItem { name = "agi"; desktopName = "Android GPU Inspector"; - exec = "$out/bin/agi"; + exec = "agi"; icon = "agi"; categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; })]; diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index b48c0a6d16a3..7486a885a548 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { desktopItems = [(makeDesktopItem { name = pname; desktopName = "Snapdragon Profiler"; - exec = "$out/bin/snapdragon-profiler"; + exec = "snapdragon-profiler"; icon = "snapdragon-profiler"; comment = meta.description; categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; From 315d85466cd42fbe79282df8cea203a62b5a9c35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Mar 2022 18:13:24 +0100 Subject: [PATCH 11/26] traitor: 0.0.9 -> 0.0.14 --- pkgs/tools/security/traitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index 8132364298b6..3401fe4f31e6 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "traitor"; - version = "0.0.9"; + version = "0.0.14"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SHfAPPVq5OmS0yPaSXGsMjskQdosoBN4XRLSzkrviJM="; + sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU="; }; vendorSha256 = null; From d48f3c496a17acf833f2e99cae4b65c930dfb161 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Wed, 9 Mar 2022 18:50:22 +0100 Subject: [PATCH 12/26] maintainers: add vbrandl --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 07822cfa623e..0481683b14ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13978,6 +13978,12 @@ github = "jpagex"; githubId = 635768; }; + vbrandl = { + name = "Valentin Brandl"; + email = "mail+nixpkgs@vbrandl.net"; + github = "vbrandl"; + githubId = 20639051; + }; portothree = { name = "Gustavo Porto"; email = "gustavoporto@ya.ru"; From 8547a003aab9ee74d88a746233bd25e9e1339288 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Wed, 9 Mar 2022 18:51:12 +0100 Subject: [PATCH 13/26] psst: init at unstable-2022-01-25 --- pkgs/applications/audio/psst/default.nix | 39 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/psst/default.nix diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix new file mode 100644 index 000000000000..d2d4927c1135 --- /dev/null +++ b/pkgs/applications/audio/psst/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "psst"; + version = "unstable-2022-01-25"; + + src = fetchFromGitHub { + owner = "jpochyla"; + repo = pname; + rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc"; + sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU="; + }; + + cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M="; + # specify the subdirectory of the binary crate to build from the workspace + buildAndTestSubdir = "psst-gui"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + atk + cairo + dbus + gdk-pixbuf + glib + gtk3 + pango + ]; + + meta = with lib; { + description = "Fast and multi-platform Spotify client with native GUI"; + homepage = "https://github.com/jpochyla/psst"; + license = licenses.mit; + maintainers = [ maintainers.vbrandl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc874b8c879..2f8414b523d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28963,6 +28963,8 @@ with pkgs; spotifywm = callPackage ../applications/audio/spotifywm { }; + psst = callPackage ../applications/audio/psst { }; + squeezelite = callPackage ../applications/audio/squeezelite { }; ltunify = callPackage ../tools/misc/ltunify { }; From a16dd81c2ef8ae2bb60f417966849a214bab7df8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 17:53:33 +0000 Subject: [PATCH 14/26] python310Packages.google-cloud-firestore: 2.3.4 -> 2.4.0 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 50a08e66f360..bc22afe4614b 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.4"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw="; + sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4="; }; propagatedBuildInputs = [ From 47ebcd1bbe44e439e511e6389f468e9d679968f9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 9 Mar 2022 20:59:13 +0300 Subject: [PATCH 15/26] =?UTF-8?q?josm:=2018360=20=E2=86=92=2018387?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d1a8bd1077a3..cc6d4e33fb24 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18360"; + version = "18387"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s="; + sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8="; + sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From d1c001aa0b58768defcc77ae110fb82197b8961a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 19:43:11 +0000 Subject: [PATCH 16/26] python310Packages.google-resumable-media: 2.3.1 -> 2.3.2 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 0b81aa71eba6..6aca35ae9e0b 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H02LFRlnZv34qGD9LPqmGEE4cH7F+SHNGDQGel39Lbc="; + sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; From 129da95a6553ee1a06259d0e6fbd583c91ed1b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Mar 2022 19:53:48 +0000 Subject: [PATCH 17/26] python3Packages.radios: 0.1.0 -> 0.1.1 https://github.com/frenck/python-radios/releases/tag/v0.1.1 --- pkgs/development/python-modules/radios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index 6c2bba30ead5..c5b4413540c4 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "radios"; - version = "0.1.0"; + version = "0.1.1"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-radios"; rev = "v${version}"; - hash = "sha256-3xRtOGY9DYnZN0g95213vWDbO3/XZZ5+s7A9sqNmO/w="; + hash = "sha256-NCBch9MCWVD6ez0sIUph8rwOOzEMZtwC4atXJe53xZM="; }; postPatch = '' From 82a041ec03c0343aafe8ace8d9b2740b5b04c851 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 12:58:56 -0800 Subject: [PATCH 18/26] spire: fix meta homepage --- pkgs/tools/security/spire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index bb165c41d07b..5f06abeda1b0 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { meta = with lib; { description = "The SPIFFE Runtime Environment"; - homepage = "github.com/spiffe/spire"; + homepage = "https://github.com/spiffe/spire"; license = licenses.asl20; maintainers = with maintainers; [ jonringer fkautz ]; }; From edf93753747399ef21ce268da035282973256694 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 21:02:15 +0000 Subject: [PATCH 19/26] python310Packages.google-cloud-error-reporting: 1.5.0 -> 1.5.1 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 06c4d9e23696..9c5af01714c5 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qvhZU7T2fHA2uRyXJjRxqeEAFwShH+TpGwICczgX7Sk="; + sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c="; }; postPatch = '' From 7460096bb3011ae7af37ed2ec2420bf5e25f3aa5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 19:15:09 +0000 Subject: [PATCH 20/26] git-remote-hg: 1.0.2.1 -> 1.0.3.2 --- .../git-and-tools/git-remote-hg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 4490f8068e04..b76f7515eba6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; - version = "1.0.2.1"; + version = "1.0.3.2"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; rev = "v${version}"; - sha256 = "1crgq13v2p9wmw1yhckmyzybh8h1nz3839qhqvzh48vxqkailzmn"; + sha256 = "0b5lfbrcrvzpz380817md00lbgy5yl4y76vs3vm0bpm5wmr7c027"; }; nativeBuildInputs = [ From 6e3286cc63654d3c279424f55ba4118f6fccf6a8 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Sun, 6 Mar 2022 00:34:46 +0000 Subject: [PATCH 21/26] wails: init at 2.0.0-beta.33 --- pkgs/development/tools/wails/default.nix | 78 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/tools/wails/default.nix diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix new file mode 100644 index 000000000000..2d0576592ec6 --- /dev/null +++ b/pkgs/development/tools/wails/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, pkg-config +, makeWrapper +, go +, gcc +, gtk3 +, webkitgtk +, nodejs +, upx +, zlib +}: + +buildGoModule rec { + pname = "wails"; + version = "2.0.0-beta.33"; + + src = fetchFromGitHub { + owner = "wailsapp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-efxOL/FllToum0P4JyAJt0fbrznTFYh7czTWpZu3uk0="; + } + "/v2"; + + vendorSha256 = "sha256-qPMVsvud2L7hpXUOfYYMiO32JXff8ZZC34EsxFoSJ0g="; + + proxyVendor = true; + + subPackages = [ "cmd/wails" ]; + + # These packages are needed to build wails + # and will also need to be used when building a wails app. + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + # Wails apps are built with Go, so we need to be able to + # add it in propagatedBuildInputs. + allowGoReference = true; + + # Following packages are required when wails used as a builder. + propagatedBuildInputs = [ + pkg-config + go + gcc + gtk3 + webkitgtk + nodejs + upx + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # As Wails calls a compiler, certain apps and libraries need to be made available. + postFixup = '' + wrapProgram $out/bin/wails \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ + --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" + ''; + + doCheck = true; + + meta = with lib; { + description = "Build applications using Go + HTML + CSS + JS"; + homepage = "https://wails.io"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575ca2a4c020..d847a5034eea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15882,6 +15882,8 @@ with pkgs; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + wails = callPackage ../development/tools/wails { }; + whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; whatstyle = callPackage ../development/tools/misc/whatstyle { From f3a9b0b1a72abecb92827af8e9b0d06454985bfc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Mar 2022 07:37:13 +1000 Subject: [PATCH 22/26] kepubify: 4.0.3 -> 4.0.4 https://github.com/pgaskin/kepubify/releases/tag/v4.0.4 --- pkgs/tools/misc/kepubify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index cd30674b31a8..0a6888bb3421 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pe4jNBoPjrkvsdeFjH4TNwacp0qkf+v+SjIAZqV1GWE="; + sha256 = "sha256-H6W+C5twXit7Z9hLIJKAftbnvYDA9HAb9tR6yeQGRKI="; }; - vendorSha256 = "sha256-eiFG6lgsY5hf+XT3Kf5uA4Ai8vBbPsh1T4ObV+rj30Y="; + vendorSha256 = "sha256-QOMLwDDvrDQAaK4M4QhBFTGD1CzblkDoA3ZqtCoRHtQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 55102a39727496a451201ff1aef645bda9edd4ca Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 12:08:02 -0800 Subject: [PATCH 23/26] qtile: fix meta, version, pname --- pkgs/applications/window-managers/qtile/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index c4a33628e131..4a48225d8013 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -69,4 +69,7 @@ in name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; + + # restore original qtile attrs + inherit (unwrapped) pname version meta; }) From b07b0e1b91cc5a6f6517fe6467c74038fcff39c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 22:09:24 +0000 Subject: [PATCH 24/26] python310Packages.azure-synapse-artifacts: 0.11.0 -> 0.12.0 --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index b24417b325ab..5a83385b7541 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa"; + sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo="; }; propagatedBuildInputs = [ From c18c87106cd9d0ef0a8f7b3c361081db2eca88bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 22:29:15 +0000 Subject: [PATCH 25/26] python310Packages.sphinxext-opengraph: 0.6.1 -> 0.6.2 --- .../python-modules/sphinxext-opengraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index f77ee113bb05..8b68eea25668 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-kaKOKeztP89SLF4yrUFW1TTAEyAaCTm2XCcOH0b+Dzc="; + sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI="; }; propagatedBuildInputs = [ From 36a211e1ee3a324e9279f5cfa64de66293b7a214 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 13:17:38 +0000 Subject: [PATCH 26/26] cloud-hypervisor: 21.0 -> 22.0 --- .../virtualization/cloud-hypervisor/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 955d609d7a28..bb94c2986f35 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "21.0"; + version = "22.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5"; + sha256 = "1n4i7rgx8rkif2naw429fnkhv0888sfxmnky67fd42mlv1lhz9w8"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d"; + cargoSha256 = "0kc6lcwlqg9l19l4psakgkc5jf28nw1riz85adci897yha1dsnh0"; + + OPENSSL_NO_VENDOR = true; # Integration tests require root. cargoTestFlags = [ "--bins" ];