diff options
Diffstat (limited to 'pkgs')
5 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index a941ea485b7..6cc731710b7 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.3.6"; + name = "qmmp-1.3.7"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0dihy6v6j1cfx4qgwgajdn8rx6nf8x5srk8yjki9xh1mlcaanhp8"; + sha256 = "13mk8p7bfl3fkavpqyhpcxkxb8a4f5d4qc1lasyf7wls3ghrdag7"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -55,7 +55,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based audio player that looks like Winamp"; - homepage = http://qmmp.ylsoftware.com/; + homepage = "http://qmmp.ylsoftware.com/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 316b86efe61..0fd58143868 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils , conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig -, autoPatchelfHook, breakpointHook, ethtool, utillinux, ipset -, fetchFromGitHub, fetchurl, fetchzip, fetchgit +, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip +, fetchgit }: with lib; @@ -64,10 +64,10 @@ let }; meta = { - description = "k3s-cni-plugins"; + description = "CNI plugins, as patched by rancher for k3s"; license = licenses.asl20; homepage = https://k3s.io; - maintainers = []; + maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; }; @@ -76,7 +76,7 @@ let k3sRepo = fetchgit { url = "https://github.com/rancher/k3s"; rev = "v${k3sVersion}"; - leaveDotGit = true; # for version / build date below + leaveDotGit = true; # ./scripts/version.sh depends on git sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm"; }; # Stage 1 of the k3s build: @@ -110,8 +110,8 @@ let patches = [ ./patches/00-k3s.patch ]; - nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ]; - buildInputs = [ git runc libseccomp ]; + nativeBuildInputs = [ git pkgconfig ]; + buildInputs = [ libseccomp ]; buildPhase = '' pushd go/src/${goPackagePath} @@ -136,7 +136,7 @@ let description = "The various binaries that get packaged into the final k3s binary."; license = licenses.asl20; homepage = https://k3s.io; - maintainers = []; + maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; }; @@ -150,8 +150,8 @@ let patches = [ ./patches/00-k3s.patch ]; - nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ]; - buildInputs = [ git k3sBuildStage1 ]; + nativeBuildInputs = [ git pkgconfig ]; + buildInputs = [ k3sBuildStage1 k3sPlugins runc ]; # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script @@ -191,7 +191,7 @@ let description = "The k3s go binary which is used by the final wrapped output below."; license = licenses.asl20; homepage = https://k3s.io; - maintainers = []; + maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; }; @@ -229,7 +229,7 @@ stdenv.mkDerivation rec { description = "A lightweight Kubernetes distribution."; license = licenses.asl20; homepage = https://k3s.io; - maintainers = with maintainers; [ euank ]; + maintainers = [ maintainers.euank ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 9613313078f..f5ad1b413ca 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.30.2" +version = "0.30.4" dependencies = [ "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 94fbd4678d5..04e7d17503b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.2"; + version = "0.30.4"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1p7j80vqlrrprrlnaysng542kl3q87r6kv9mxzdb8605g1ma8wd6"; + sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0j5ky547xlgfiz4mk7n7fhv1s9v697lvyqsjlj7jc5y9knx56n1j"; + cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index b4626b9e8f8..240dc626331 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.2.4"; + version = "3.3.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "15his6mv3vmzfg972fb8m01h2m3jxmaqz3zw2krfr136mvg2rvjw"; + sha256 = "1c6zadqnn4b83yglcdn1hw54jj1c4makbdy6fli3cfb7sha1ynml"; }; - cargoSha256 = "0ajkpshjv0im6falgjrsc2jdbvm2rhibl4v8rcmb2fg3kx7xc8vf"; + cargoSha256 = "148982ypkxhab2kmijk9zwwi5l6nk4rcdwaz0r1j9fni47q49f35"; buildInputs = lib.optional stdenv.isDarwin Security; |