From b88bbb39c0680a142ddb13d96fb5ad4b61a8a202 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Mar 2022 13:09:51 +0000 Subject: [PATCH 01/14] opentelemetry-collector: 0.45.0 -> 0.46.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 72aea5c44d9a..851d4f2dc182 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-uwQR38L81galqrOEF2qWxKi1UelaUmpkeg0WbkcbYfs="; + sha256 = "sha256-ibaA9oCSsId9A4ul5sfM+L8ExBl+Wv7rhGnb6TZ4WJw="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-wzGv46wcPjpxiQsiNZQGC4DMHcMrWOEmacC5E0F2YCs="; + vendorSha256 = "sha256-Okmsd/skfBmkyLv9oPFH0QvewFZFPpUH2ahWxHt7cy8="; preBuild = '' # set the build version, can't be done via ldflags From b8987416e9baf19c7799753e5e2ef2fc0742a030 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Mar 2022 13:16:08 +0000 Subject: [PATCH 02/14] opentelemetry-collector-contrib: 0.45.1 -> 0.46.0 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 4bfc390335d8..57a21a2822db 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.45.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-HoDQK/WyvDQgYBr6WPJ+bZE3GTx74SGgSj1P6i8AfL0="; + sha256 = "sha256-VD/gN9lUwzhRTfr8rAQld+4sN+deYhUlNvCphtZncDU="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-e33EV1DGpR3XL70sjfCSMeuOSyh334+AkHnE+vqHrh0="; + vendorSha256 = "sha256-ojNDDPCo6TGp8BYio/pYykXSLjC5Qplw0WFD9UIiYM4="; subPackages = [ "cmd/otelcontribcol" ]; From 95874cf1c7b30fd4d9b63cd1a628cced5805e78a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 6 Mar 2022 23:29:30 -0500 Subject: [PATCH 03/14] goreleaser: 1.5.0 -> 1.6.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 6ba612070431..ec3f480ebf1a 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H7LgADzES5Zi5+lcooix+WCjDxqkThIIGvwa8IiHDHo="; + sha256 = "sha256-MnsIm8E6CR5tEB6Oq35fJKQiPJfqP86/hp0t6lqJ0JE="; }; - vendorSha256 = "sha256-4Hb+SmmPk4+c4QoOJADinKGD1xd0RYzn2wniuBxatAw="; + vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM="; ldflags = [ "-s" From b2b4a70a2b2fe09b7c612412de4dfd3a79774a8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 10:10:05 +0000 Subject: [PATCH 04/14] maddy: 0.5.3 -> 0.5.4 --- pkgs/servers/maddy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 598946037db6..11da56c6eb99 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "maddy"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-UB9Y2nNkiN0L3NIfUqnpaJJqNuAnCYIeEyS60TnnIRs="; + sha256 = "sha256-FWoPAb/aHaQLxT+UUUoViCmLvauVuAzUyOmRNB8F72U="; }; - vendorSha256 = "sha256-lL9hlICc9t/2v6eawG8LU6hpAKpY7raTg5l1RagewPs="; + vendorSha256 = "sha256-rcHboPfs2mWg3sgsLmN1IPoppmuDcsx0bQICp6EzYsQ="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; From b11124adbd9b40c4676e563b56d3bcc7bc5dec13 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 7 Mar 2022 10:01:11 -0500 Subject: [PATCH 05/14] kopia: 0.10.5 -> 0.10.6 --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 1eac3f04325d..09f17b9a2be5 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-9H57NlvyEEOX2F3ooWWqDAo7MnS9J+XrYv/cIyNo6+Y="; + sha256 = "sha256-lyCTKjimVZkpXKVeDNn0e9E6FkDp7fUl3cYnn5W5A7o="; }; - vendorSha256 = "sha256-c8WohMyaOicPq2q+DkgNBBulMEJCZFNFe+xECUEpelI="; + vendorSha256 = "sha256-p+hK662WoO98J/uE3B9X1GvpnyMGu21sAg8GcyTlWZM="; doCheck = false; From c6e160cb7ead120414adc05b821bf1f39e0307e7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 7 Mar 2022 21:36:07 +0100 Subject: [PATCH 06/14] nautilus-open-any-terminal: 0.2.15 -> 0.2.16 --- pkgs/tools/misc/nautilus-open-any-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 321b139ca157..c62bcbe0bc76 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -15,13 +15,13 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; rev = version; - sha256 = "sha256-cc6Lh5XeAuU5Os4eJ0QcL6XJYB6DqxeUGaOf6m1OnpY="; + sha256 = "sha256-g5B+tp131vmjShBCGrKR5ZQCjtJY823/kPacZ0S9E80="; }; patches = [ ./hardcode-gsettings.patch ]; From 6469f38eff85c5dffb200631484157d8852b1e59 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 5 Mar 2022 01:21:10 +0100 Subject: [PATCH 07/14] spicetify-cli: 2.9.1 -> 2.9.2 --- pkgs/applications/misc/spicetify-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 7617984ac910..08a54f49584a 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rs70LmJ/+pbISQpPuEYV2URFv7uf+jdTVQopUSKExSY="; + sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; From 80848ac30b145e9f98e4915328c151b214ce75f5 Mon Sep 17 00:00:00 2001 From: maximsmol Date: Tue, 8 Mar 2022 10:27:36 +0800 Subject: [PATCH 08/14] maintainers: add maximsmol --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e803c5ceb4d3..41f985f9381c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7747,6 +7747,12 @@ githubId = 1187050; name = "Maximilian Huber"; }; + maximsmol = { + email = "maximsmol@gmail.com"; + github = "maximsmol"; + githubId = 1472826; + name = "Max Smolin"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; From 83689de77b1f4c91401318f004539dd7e11bb55b Mon Sep 17 00:00:00 2001 From: maximsmol Date: Tue, 8 Mar 2022 10:31:11 +0800 Subject: [PATCH 09/14] vscode-extensions.skellock.just: init at 2.0.0 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5a6545bb1d9f..7e9a71ff7586 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1783,6 +1783,23 @@ let }; }; + skellock.just = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "just"; + publisher = "skellock"; + version = "2.0.0"; + sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; + }; + meta = with lib; { + changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md"; + description = "Provides syntax and recipe launcher for Just scripts"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just"; + homepage = "https://github.com/skellock/vscode-just"; + license = licenses.mit; + maintainers = with maintainers; [ maximsmol ]; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; From 73ac9b5262c7bfe3e3e182c7b632286cb61873f4 Mon Sep 17 00:00:00 2001 From: Maxime VISONNEAU Date: Tue, 8 Mar 2022 03:59:38 +0000 Subject: [PATCH 10/14] prometheus-gitlab-ci-pipelines-exporter: 0.4.9 -> 0.5.3 --- .../prometheus/gitlab-ci-pipelines-exporter.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 840234a0307f..1c24c065ed77 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,17 +2,22 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.4.9"; + version = "0.5.3"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "13zs8140n4z56i0xkl6jvvmwy80l07dxyb23wxzd5avbdm8knypz"; + sha256 = "1i0ry93w2pk8m7i4fbdn1xvsmvjn83d6lr6l7yywid9d0kmkjz13"; }; - vendorSha256 = "1k620r3d1swhj7cfmqjh5n08da2a6w87fwrsajl0y324iyw2chsa"; + subPackages = [ "cmd/${pname}" ]; + ldflags = [ + "-X main.version=v${version}" + ]; + + vendorSha256 = "UszZaxql5sO4DSDVD/UIjeeDojCQEPF+ATL7O9MaTG8="; doCheck = true; meta = with lib; { From e444e32090f927cbe61a8065a02d9ed666b89228 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 7 Mar 2022 10:57:47 -0600 Subject: [PATCH 11/14] zeal: bump git rev 2020-07-03 -> 2021-12-25 --- pkgs/data/documentation/zeal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 8c806b87d4b2..de3d7638eb9b 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -9,8 +9,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67"; - sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr"; + rev = "763edca12ccd6c67e51f10891d1ced8b2510904f"; + sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8="; }; # we only need this if we are using a version that hasn't been released. We From 1771db158dc515c78bb712c9fbe2fbd095e5ced9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 03:06:08 +0000 Subject: [PATCH 12/14] bombadillo: 2.3.3 -> 2.4.0 --- pkgs/applications/networking/browsers/bombadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index b07c526c0d51..983f8ac1ee39 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "bombadillo"; - version = "2.3.3"; + version = "2.4.0"; src = fetchgit { url = "https://tildegit.org/sloum/bombadillo.git"; rev = version; - sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"; + sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; }; nativeBuildInputs = [ installShellFiles ]; From e091b04977062b31b1781504143753c13ed2415b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 8 Mar 2022 11:50:10 +0800 Subject: [PATCH 13/14] swaylock: 1.5 -> 1.6 --- pkgs/applications/window-managers/sway/lock.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 6dccedad827b..b70160b1dbfd 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf"; + sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '1.4'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; From f22969e855ddb6e4b29d15962912e1aaa7a63bdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Mar 2022 17:03:44 +0000 Subject: [PATCH 14/14] sigil: 1.9.0 -> 1.9.1 --- pkgs/applications/editors/sigil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index cd776fb6bfcf..0da5a2c25502 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw="; + sha256 = "sha256-PsHliyJu61QFTFZUgDtxguu18GBVTOGMW6pPYjHhvG0="; }; pythonPath = with python3Packages; [ lxml ];