From d783afb8de9a375d4573e31c2d6b455093385492 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 29 Aug 2021 18:07:51 +0200 Subject: [PATCH 01/12] cozy: 1.0.3 -> 1.1.2 --- pkgs/applications/audio/cozy-audiobooks/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 88ac8002140e..3a53f7d2df92 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , gobject-introspection , libhandy +, libdazzle , python3Packages , file , cairo @@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.0.3"; + version = "1.1.2"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -33,7 +34,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "0m0xiqpb87pwr3fhy0a4qxg67yjhwchcxj3x2anyy0li4inryxag"; + sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ python3Packages.buildPythonApplication rec { cairo gettext gnome.adwaita-icon-theme + libdazzle libhandy pantheon.granite ] ++ (with gst_all_1; [ From a3c6a337686cea58eab5d52625b5935c917c809e Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Wed, 28 Jul 2021 21:22:21 +0200 Subject: [PATCH 02/12] cozy: add gst-plugin-bad This adds support for: ISO Media, Apple iTunes ALAC/AAC-LC (.M4A) Audio --- pkgs/applications/audio/cozy-audiobooks/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 3a53f7d2df92..fa864700dbe7 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -58,6 +58,7 @@ python3Packages.buildPythonApplication rec { gst-plugins-good gst-plugins-ugly gst-plugins-base + gst-plugins-bad ]); propagatedBuildInputs = with python3Packages; [ From c8624013d3cd14134349f43f3272d97c32092ee9 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 29 Aug 2021 18:11:36 +0200 Subject: [PATCH 03/12] cozy: rename directory and drop unused argument Suggestions by @mweinelt and @r-rmcgibbo. --- pkgs/applications/audio/{cozy-audiobooks => cozy}/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/applications/audio/{cozy-audiobooks => cozy}/default.nix (99%) diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy/default.nix similarity index 99% rename from pkgs/applications/audio/cozy-audiobooks/default.nix rename to pkgs/applications/audio/cozy/default.nix index fa864700dbe7..afceca2a54ba 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -11,7 +11,6 @@ , libhandy , libdazzle , python3Packages -, file , cairo , gettext , gnome diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3597b93ea47d..de106c6efa8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1450,7 +1450,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) PCSC; }; - cozy = callPackage ../applications/audio/cozy-audiobooks { }; + cozy = callPackage ../applications/audio/cozy { }; cpuid = callPackage ../os-specific/linux/cpuid { }; From 682ed1816c728f184164d099b6097317951640c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Sep 2021 19:06:17 +0200 Subject: [PATCH 04/12] python3Packages.time-machine: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/time-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 1c4be8946aef..9eabd929ae9e 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.3.1"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "1flim8xaa7qglh2b39cf57i8g0kg0707pw3mdkrgh0xjn27bv9bi"; + sha256 = "sha256-1k8mGkgJw0MfydJ/Sm8qDvFNaIqoHR1fZkVrXxvc8Zk="; }; propagatedBuildInputs = [ From ecbecedb0d140c4e2ca0c2b26ce7750d5883aabd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Sep 2021 20:31:06 +0200 Subject: [PATCH 05/12] python3Packages.haversine: 2.4.0 -> 2.5.1 --- pkgs/development/python-modules/haversine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 614e664c19c0..6080294653ee 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "mapado"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q38oeSy1ilXWc2r/GW8EWQHH2Ty+DyTxxrDX3OcOwKc="; + sha256 = "sha256-tHA1Ff/J1mfSnER2X/8e0QyQkuRz1mn8MeGlThVQaSg="; }; checkInputs = [ From a9667fc80fbd5b7ba49c025fbf8cfe121acef68d Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 2 Sep 2021 22:57:06 +0200 Subject: [PATCH 06/12] luarocks: add bash/zsh completion --- pkgs/development/tools/misc/luarocks/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index f3ec4b4d7a43..c2449de5dd28 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -5,6 +5,7 @@ , zip # some packages need to be compiled with cmake , cmake +, installShellFiles }: stdenv.mkDerivation rec { @@ -37,9 +38,9 @@ stdenv.mkDerivation rec { fi ''; - buildInputs = [ - lua curl makeWrapper which - ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + buildInputs = [ lua curl which ]; postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* @@ -52,6 +53,9 @@ stdenv.mkDerivation rec { --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done + + installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) + installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) ''; propagatedBuildInputs = [ zip unzip cmake ]; From 3f2bdc19c135ce1489f36259e1766263337588af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Sep 2021 23:07:25 +0200 Subject: [PATCH 07/12] python3Packages.policyuniverse: 1.4.0.20210816 -> 1.4.0.20210819 --- pkgs/development/python-modules/policyuniverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 3c3c318efc8c..d8e102957b1b 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.4.0.20210816"; + version = "1.4.0.20210819"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "05fxn89f6rr5rrp117cnqsfzy1p3nbmq3izq2jqk6kackcr3cl8x"; + sha256 = "sha256-RBRUR9Rzw3/yd2ZnteEBigDApJPBagpIk5lSGzeGqL4="; }; # Tests are not shipped and there are no GitHub tags From cff78ebaf61e3b13e46735707904e980deaf0614 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 3 Sep 2021 03:01:30 +0000 Subject: [PATCH 08/12] vscode: 1.59.1 -> 1.60.0 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3131c3a7bf8c..e6a5a9d5dca7 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0i2pngrp2pcas99wkay7ahrcn3gl47gdjjaq7ladr879ypldh24v"; - x86_64-darwin = "1pni2cd5s6m9jxwpja4ma9xlr1q3xl46w8pim3971dw3xi5r29pg"; - aarch64-linux = "0j71ha2df99583w8r2l1hppn6wx8ll80flwcj5xzj7icv3mq8x7v"; - aarch64-darwin = "0vhp1z890mvs8hnwf43bfv74a7y0pv5crjn53rbiy0il1ihs1498"; - armv7l-linux = "07yb0ia1rnbav3gza2y53yd3bcxqmngddd4jz6p4y0m539znl817"; + x86_64-linux = "0g49765pnimh107pw3q7dlgd6jcmr5gagsvxrdx8i93mbxb0xm0c"; + x86_64-darwin = "1837fcpllblm970jxsal0ahxsnjmsgydy6g6qn51hp7f797gi7zb"; + aarch64-linux = "1bpmgv6hjyb7jl9v8qyqiyr0brl4xq3wnls2v9hirja6ls1x14cx"; + aarch64-darwin = "0qksfscbiyr2ynw3j86g8wm7myyabkjwx03ik3z6rrv7dffb5yii"; + armv7l-linux = "063p2wy1wl57p43f3md0wp2d981nnb650hyqs9rgqm4mlk2s168g"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.59.1"; + version = "1.60.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From dcbe696fa80853e6c3b81af00cd0118074a8fc05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Sep 2021 08:40:38 +0000 Subject: [PATCH 09/12] python38Packages.sqlmap: 1.5.8 -> 1.5.9 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index e66cdd8967d0..310db13d1e47 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.8"; + version = "1.5.9"; src = fetchPypi { inherit pname version; - sha256 = "01wyhmvg9yh5q86z7kahbvj2xnkjyvi1h2qj7clgz5yd76sh8ygn"; + sha256 = "1714780f8835854c6f949f854fca936c3064b9a7e0da96989bb637a6ba5c119b"; }; postPatch = '' From 79725cdc4d81395191a3603a61fdb14eb739b9cf Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Sep 2021 11:49:46 +0200 Subject: [PATCH 10/12] chromiumDev: 95.0.4621.4 -> 95.0.4628.3 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 93511c8febae..f095138416bd 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4621.4", - "sha256": "06fgdyg3bychqhf31fikk7s4qp3rc7hmsvm6p2bj9ascd6kzjzx8", - "sha256bin64": "1bvkdrc7cznb9xrnld642qj3z7vbyin9xbq0pp6kqva4gck41cyn", + "version": "95.0.4628.3", + "sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3", + "sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96", "deps": { "gn": { "version": "2021-08-11", From b891957a976e4118322b36ab9e312e79925ec5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Fri, 3 Sep 2021 11:48:07 +0200 Subject: [PATCH 11/12] Allow to execute update script in CI environment If the script is executed in a CI (like in github actions, with the install-nix-action) it fails. This changes fixes that use case. In that scenario, you should provide the --no-commit flag. --- maintainers/scripts/pluginupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index c468b33bb478..2a9a2d4c0a23 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -547,7 +547,6 @@ def update_plugins(editor: Editor, args): log.setLevel(LOG_LEVELS[args.debug]) log.info("Start updating plugins") - nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) update = editor.get_update(args.input_file, args.outfile, args.proc) redirects = update() @@ -556,6 +555,7 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: + nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) if redirects: From d14e9188d1cd88f1b530bf860638c2de27486a6d Mon Sep 17 00:00:00 2001 From: Kim Lindberger Date: Fri, 3 Sep 2021 13:23:00 +0200 Subject: [PATCH 12/12] gitaly: Fix gitaly-git2go binary name (#136569) https://gitlab.com/gitlab-org/gitaly/-/commit/e7f8fe4f6759669c24b2fd216beaab4a477c5b3d changed the binary name to always end with its module version. This makes sure gitaly's internal version references are set to the package version and renames the binary, postfixing it with the package version. --- .../version-management/gitlab/gitaly/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index ac3bc1653ab9..81a92d21f944 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -10,9 +10,13 @@ let copyGemFiles = true; gemdir = ./.; }; -in buildGoModule rec { version = "14.2.1"; + gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; +in + +buildGoModule { pname = "gitaly"; + inherit version; src = fetchFromGitLab { owner = "gitlab-org"; @@ -27,6 +31,8 @@ in buildGoModule rec { inherit rubyEnv; }; + ldflags = "-X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}"; + tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; @@ -35,6 +41,7 @@ in buildGoModule rec { postInstall = '' mkdir -p $ruby cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby + mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version} ''; outputs = [ "out" "ruby" ];