git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commitcfef27f7cfa05a59b768ae3c4aa0c54bb9572677 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateTue 25 Jan 2022, 06:01 (5 years ago) parentbbbd0a98bd55a6
15 files changed+35−31
compare with master
unifiedsplit
maintainers/maintainer-list.nix+1−1 pkgs/applications/audio/librespot/default.nix+2−1 pkgs/applications/misc/binance/default.nix+2−2 pkgs/applications/networking/cluster/kubernetes/default.nix+2−2 pkgs/applications/networking/flexget/default.nix+2−2 pkgs/applications/virtualization/conmon/default.nix+2−2 pkgs/development/compilers/gleam/default.nix+3−3 pkgs/development/interpreters/elixir/1.13.nix+2−2 pkgs/development/tools/analysis/cargo-tarpaulin/default.nix+3−3 pkgs/development/tools/efm-langserver/default.nix+2−2 pkgs/games/legendary-gl/default.nix+2−2 pkgs/tools/admin/fioctl/default.nix+2−2 pkgs/tools/misc/mcfly/default.nix+3−3 pkgs/tools/networking/dnsproxy/default.nix+2−2 pkgs/tools/networking/strongswan/default.nix+5−2
maintainers/maintainer-list.nix+1−1
@@ -7026,7 +7026,7 @@
70267026 email = "nullarequest@vivlaid.net";
70277027 github = "Lunarequest";
70287028 githubId = 30698906;
7029− name = "Advaith Madhukar"; # this is my legal name, I prefer Luna; please keep that in mind!
7029+ name = "Luna D Dragon";
70307030 };
70317031 lionello = {
70327032 email = "lio@lunesu.com";
pkgs/applications/audio/librespot/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
1+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
22, withALSA ? true, alsa-lib ? null, withPulseAudio ? false, libpulseaudio ? null
33, withPortAudio ? false, portaudio ? null }:
44
@@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec {
3535 license = with licenses; [ mit ];
3636 maintainers = with maintainers; [ bennofs ];
3737 platforms = platforms.unix;
38+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/librespot.x86_64-darwin
3839 };
3940}
pkgs/applications/misc/binance/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "binance";
6− version = "1.29.0";
6+ version = "1.30.1";
77
88 src = fetchurl {
99 url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
10− sha256 = "sha256-LQX5RUTVm6lBdRzCFMBq1NLGGiLBVyykJ1LY9FqINnY=";
10+ sha256 = "sha256-Su8pVf5GSBK770D778MmrgYr0ov/JBTNcnL8EZzoG3U=";
1111 };
1212
1313 nativeBuildInputs = [
pkgs/applications/networking/cluster/kubernetes/default.nix+2−2
@@ -21,13 +21,13 @@
2121
2222stdenv.mkDerivation rec {
2323 pname = "kubernetes";
24− version = "1.22.4";
24+ version = "1.22.6";
2525
2626 src = fetchFromGitHub {
2727 owner = "kubernetes";
2828 repo = "kubernetes";
2929 rev = "v${version}";
30− sha256 = "sha256-6ivBecOttzbX85+WCttaU5nXjaiEiKU8xRhnCPkjLXg=";
30+ sha256 = "sha256-NL00GOdkVLVHTlj1RK1+stssioy+0xbtiKn4FZnCuzs=";
3131 };
3232
3333 nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
pkgs/applications/networking/flexget/default.nix+2−2
@@ -2,14 +2,14 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "flexget";
5− version = "3.2.13";
5+ version = "3.2.15";
66
77 # Fetch from GitHub in order to use `requirements.in`
88 src = fetchFromGitHub {
99 owner = "flexget";
1010 repo = "flexget";
1111 rev = "v${version}";
12− sha256 = "0pk6f9vrj01a91h86d5mvngwvxq9r6idbrfax1nfsissvssy6p07";
12+ sha256 = "0ygkygd0gcldwdx6wl1kbvzi93k75m0v05m614cahh0jc7j27xy7";
1313 };
1414
1515 postPatch = ''
pkgs/applications/virtualization/conmon/default.nix+2−2
@@ -11,13 +11,13 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "conmon";
14− version = "2.0.32";
14+ version = "2.1.0";
1515
1616 src = fetchFromGitHub {
1717 owner = "containers";
1818 repo = pname;
1919 rev = "v${version}";
20− sha256 = "sha256-aj0RQVVJp2S8cIYT7fsbK1TLaK0auvdgEIgkZJktsdo=";
20+ sha256 = "sha256-75Xyp25+JJtrXJO+cRFPkDj64zgdlVTAygGwFuJ7jKA=";
2121 };
2222
2323 nativeBuildInputs = [ pkg-config ];
pkgs/development/compilers/gleam/default.nix+3−3
@@ -2,13 +2,13 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "gleam";
5− version = "0.18.2";
5+ version = "0.19.0";
66
77 src = fetchFromGitHub {
88 owner = "gleam-lang";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-uakZmaIkBgC/FTQ7us58pJT6IzpcF1cQxBfehlB3bWk=";
11+ sha256 = "sha256-pJ4RSijuwdKAL24WzcDIQen1RGofN1tUlbAA18zUvBE=";
1212 };
1313
1414 nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
1616 buildInputs = [ openssl ] ++
1717 lib.optionals stdenv.isDarwin [ Security libiconv ];
1818
19− cargoSha256 = "sha256-NogDrd7YWl/CV0aCd1jfYWYB9VZG7u890VLEktI3sOQ=";
19+ cargoSha256 = "sha256-f/6LdvKRykpBX2GlRuyUcSD719f6XzhbMHzhrGNU0Cg=";
2020
2121 meta = with lib; {
2222 description = "A statically typed language for the Erlang VM";
pkgs/development/interpreters/elixir/1.13.nix+2−2
@@ -3,7 +3,7 @@
33# How to obtain `sha256`:
44# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
55mkDerivation {
6− version = "1.13.1";
7− sha256 = "0z0b1w2vvw4vsnb99779c2jgn9bgslg7b1pmd9vlbv02nza9qj5p";
6+ version = "1.13.2";
7+ sha256 = "sha256-qv85aDP3RPCa1YBo45ykWRRZNanL6brNKDMPu9SZdbQ=";
88 minimumOTPVersion = "22";
99}
pkgs/development/tools/analysis/cargo-tarpaulin/default.nix+3−3
@@ -2,13 +2,13 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-tarpaulin";
5− version = "0.18.5";
5+ version = "0.19.1";
66
77 src = fetchFromGitHub {
88 owner = "xd009642";
99 repo = "tarpaulin";
1010 rev = version;
11− sha256 = "sha256-vYfoCKHN7kaXSkZI7cdh9pzlX3LqYQNeENaoztKwcII=";
11+ sha256 = "sha256-H/EQTS+d317icCZdOWTvykzIFQC7ia7/jYFkImgogps=";
1212 };
1313
1414 nativeBuildInputs = [
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717 buildInputs = [ openssl ]
1818 ++ lib.optionals stdenv.isDarwin [ curl Security ];
1919
20− cargoSha256 = "sha256-I7a3Vm/+oUqVLPYXvlz+I0Epuems7swePmV8vmmP6TU=";
20+ cargoSha256 = "sha256-A3J5od6yT7eVU66WfvG/umne0RDBZCf8IvQpW6OTZSE=";
2121 #checkFlags = [ "--test-threads" "1" ];
2222 doCheck = false;
2323
pkgs/development/tools/efm-langserver/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "efm-langserver";
5− version = "0.0.38";
5+ version = "0.0.40";
66
77 src = fetchFromGitHub {
88 owner = "mattn";
99 repo = "efm-langserver";
1010 rev = "v${version}";
11− sha256 = "sha256-+Q3vSifPiE9PyxJnoapJ1CBKUioTHExwBbWJgWD1iNI=";
11+ sha256 = "sha256-0C7iSWO7zzOhPgzxj9k2MK6poi4XaCbMjTGah3ohVJg=";
1212 };
1313
1414 vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI=";
pkgs/games/legendary-gl/default.nix+2−2
@@ -7,13 +7,13 @@
77
88buildPythonApplication rec {
99 pname = "legendary-gl"; # Name in pypi
10− version = "0.20.24";
10+ version = "0.20.25";
1111
1212 src = fetchFromGitHub {
1313 owner = "derrod";
1414 repo = "legendary";
1515 rev = version;
16− sha256 = "sha256-4VN/2FoAXTaumPsplV9wgdUSQsFitC1hqWveAW/yt58=";
16+ sha256 = "07z5ffi7lnvs64pksy30fbfv2i11dkkycyh31vyc4y7fsn1vd0vf";
1717 };
1818
1919 propagatedBuildInputs = [ requests ];
pkgs/tools/admin/fioctl/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "fioctl";
5− version = "0.22";
5+ version = "0.23";
66
77 src = fetchFromGitHub {
88 owner = "foundriesio";
99 repo = "fioctl";
1010 rev = "v${version}";
11− sha256 = "sha256-8YIboaLFc1nliNQJPyTd/JseTbvk2aBTjVEpW3mTkZg=";
11+ sha256 = "sha256-00HWby1LwKEz4BgwD3yv0IMW9mzkTj4FMFgYAn7kLac=";
1212 };
1313
1414 vendorSha256 = "sha256-oA8/9LjMRM1RXKKDWhcbt2qr/4T7YgOq92U2mF9E+sw=";
pkgs/tools/misc/mcfly/default.nix+3−3
@@ -2,13 +2,13 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "mcfly";
5− version = "0.5.11";
5+ version = "0.5.12";
66
77 src = fetchFromGitHub {
88 owner = "cantino";
99 repo = "mcfly";
1010 rev = "v${version}";
11− sha256 = "sha256-JyNrEIgvL4TQHpAEefDnLirXplGjJcUqsmALKY44VuM=";
11+ sha256 = "sha256-VguUuQacjdcgrtIHmDdyqh6TuyJxvZCLrn4nxbEtqJc=";
1212 };
1313
1414 postPatch = ''
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
1717 substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly'
1818 '';
1919
20− cargoSha256 = "sha256-7wyRHViPL+Hb9Rwrb1dAmmz+faOl9ddNlTdQ/XvTWE8=";
20+ cargoSha256 = "sha256-Lz8uwBsgY9ORRTbEOEB6hh1r/Yb0nAgnYUayLRG4QyI=";
2121
2222 meta = with lib; {
2323 homepage = "https://github.com/cantino/mcfly";
pkgs/tools/networking/dnsproxy/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "dnsproxy";
5− version = "0.40.3";
5+ version = "0.40.5";
66
77 src = fetchFromGitHub {
88 owner = "AdguardTeam";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-OkicEDu2sMEpvBbb7JFRGusMKJeQoVe3ShsbuNCoIis=";
11+ sha256 = "sha256-wzPQ5cs/SXNcu73lLzy3D/527X3rylKwhUsPDu+v6r0=";
1212 };
1313
1414 vendorSha256 = null;
pkgs/tools/networking/strongswan/default.nix+5−2
@@ -7,6 +7,7 @@
77, enableTNC ? false, trousers, sqlite, libxml2
88, enableNetworkManager ? false, networkmanager
99, darwin
10+, nixosTests
1011}:
1112
1213# Note on curl support: If curl is built with gnutls as its backend, the
@@ -17,13 +18,13 @@ with lib;
1718
1819stdenv.mkDerivation rec {
1920 pname = "strongswan";
20− version = "5.9.4"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
21+ version = "5.9.5"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
2122
2223 src = fetchFromGitHub {
2324 owner = "strongswan";
2425 repo = "strongswan";
2526 rev = version;
26− sha256 = "1y1gs232x7hsbccjga9nbkf4bbi5wxazlkg00qd2v1nz86sfy4cd";
27+ sha256 = "sha256-Jx0Wd/xgkl/WrBfcEvZPogPAQp0MW9HE+AQR2anP5Vo=";
2728 };
2829
2930 dontPatchELF = true;
@@ -101,6 +102,8 @@ stdenv.mkDerivation rec {
101102
102103 NIX_LDFLAGS = optionalString stdenv.cc.isGNU "-lgcc_s" ;
103104
105+ passthru.tests = { inherit (nixosTests) strongswan-swanctl; };
106+
104107 meta = {
105108 description = "OpenSource IPsec-based VPN Solution";
106109 homepage = "https://www.strongswan.org";