nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-08 06:01:26 +00:00 committed by GitHub
commit efdf217c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 58 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -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";

4
pkgs/applications/editors/sigil/default.nix
View File

@ -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 ];

17
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -1787,6 +1787,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";

4
pkgs/applications/misc/spicetify-cli/default.nix
View File

@ -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=";

4
pkgs/applications/networking/browsers/bombadillo/default.nix
View File

@ -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 ];

9
pkgs/applications/window-managers/sway/lock.nix
View File

@ -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 ];

4
pkgs/data/documentation/zeal/default.nix
View File

@ -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

6
pkgs/servers/maddy/default.nix
View File

@ -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}" ];

11
pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
View File

@ -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; {

6
pkgs/tools/backup/kopia/default.nix
View File

@ -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;

6
pkgs/tools/misc/goreleaser/default.nix
View File

@ -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"

4
pkgs/tools/misc/nautilus-open-any-terminal/default.nix
View File

@ -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 ];

6
pkgs/tools/misc/opentelemetry-collector/contrib.nix
View File

@ -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" ];

6
pkgs/tools/misc/opentelemetry-collector/default.nix
View File

@ -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