From 90d2986368afbe5bb4765579e979dbc9a15b8020 Mon Sep 17 00:00:00 2001 From: Red Davies Date: Tue, 24 Nov 2020 20:22:34 -0500 Subject: [PATCH 01/16] cassandra: 3.11.4 -> 3.11.9 Reason: Fixes CVE-2020-13946 Apache Cassandra RMI Rebind Vulnerability Description: It is possible for a local attacker without access to the Apache Cassandra process or configuration files to manipulate the RMI registry to perform a man-in-the-middle attack and capture user names and passwords used to access the JMX interface. The attacker can then use these credentials to access the JMX interface and perform unauthorised operations. Users should also be aware of CVE-2019-2684, a JRE vulnerability that enables this issue to be exploited remotely. 3.11.x users should upgrade to 3.11.8 --- pkgs/servers/nosql/cassandra/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 56a3c5705b5..8ade5aac030 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.4"; - sha256 = "11wr0vcps8w8g2sd8qwp1yp8y873c4q32azc041xpi7zqciqwnax"; + version = "3.11.9"; + sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c"; }) From 849225c88a090fc18719d2817ac61494da8e942d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 7 Dec 2020 17:22:27 +0100 Subject: [PATCH 02/16] perlPackages.FileUtilTempdir: init at 0.034 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c789d4f8be..3c31ceb549e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8266,6 +8266,22 @@ let }; }; + FileUtilTempdir = buildPerlPackage { + pname = "File-Util-Tempdir"; + version = "0.034"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/File-Util-Tempdir-0.034.tar.gz"; + sha256 = "076wdwbvqsg64wr5np8j6pnmmhs9li64g9mw2h33zbbgbv7f47fi"; + }; + buildInputs = [ Perlosnames TestException ]; + meta = { + homepage = "https://metacpan.org/release/File-Util-Tempdir"; + description = "Cross-platform way to get system-wide & user private temporary directory"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + FileWhich = buildPerlPackage { pname = "File-Which"; version = "1.23"; From 55b8c6e2172e65042e5ddf6a47694b67307de700 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 7 Dec 2020 17:22:54 +0100 Subject: [PATCH 03/16] perlPackages.Logger: init at 0.037 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3c31ceb549e..c6869f67640 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11547,6 +11547,21 @@ let buildInputs = [ PathTiny TestWarn ]; }; + Logger = buildPerlPackage { + pname = "Log-ger"; + version = "0.037"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Log-ger-0.037.tar.gz"; + sha256 = "0f5078g8lkyw09ijpz7dna5xw6yvpd0m283fdrw3s152xmr43qn2"; + }; + meta = { + homepage = "https://metacpan.org/release/Log-ger"; + description = "A lightweight, flexible logging framework"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + LogHandler = buildPerlModule { pname = "Log-Handler"; version = "0.90"; From 2fc7e6ffab011a3cc12d531711bedc37df954588 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 7 Dec 2020 17:23:22 +0100 Subject: [PATCH 04/16] perlPackages.HTTPTinyCache: init at 0.002 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6869f67640..bdcece18adc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9900,6 +9900,22 @@ let }; }; + HTTPTinyCache = buildPerlPackage { + pname = "HTTP-Tiny-Cache"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/HTTP-Tiny-Cache-0.002.tar.gz"; + sha256 = "08c6274x7fxl9r7cw1yiq21wv2mjgxw7db0wv5r80dyw377vfzbk"; + }; + propagatedBuildInputs = [ FileUtilTempdir Logger ]; + meta = { + homepage = "https://metacpan.org/release/HTTP-Tiny-Cache"; + description = "Cache HTTP::Tiny responses"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; version = "0.17"; From 547376fe0e3df14f6e9a1f680ead7d325844ea73 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Tue, 8 Dec 2020 19:04:39 -0500 Subject: [PATCH 05/16] python3Packages.pandas: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 9d2d32d428a..46348deca8d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -33,11 +33,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.1.4"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6"; + sha256 = "06vhk75hmzgv1sfbjzgnsw9x10h7y6bd6s6z7d6lfnn7wcgc83zi"; }; nativeBuildInputs = [ cython ]; From c13d8fda058ca8bdfeafc73806ed9694456040ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 21:02:20 +0000 Subject: [PATCH 06/16] python37Packages.azure-batch: 9.0.0 -> 10.0.0 --- pkgs/development/python-modules/azure-batch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 906461252dc..942ae218fdd 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "9.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; + sha256 = "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; }; propagatedBuildInputs = [ From 337c3d77caa7976b513561f59846baa6e30eff31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 21:08:39 +0000 Subject: [PATCH 07/16] python37Packages.dependency-injector: 4.5.1 -> 4.5.3 --- .../python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 31616f015fe..8961d823416 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.5.1"; + version = "4.5.3"; src = fetchPypi { inherit pname version; - sha256 = "1d5d42a3547a8a8d3b7aa8f4325e5042231bbc86718c89e123c0c62c103cd9d5"; + sha256 = "345bfa4185802a712e27903b5612d4748a1e2483c3d5da8d840d8a401aeb75ea"; }; propagatedBuildInputs = [ six ]; From 33e23118f32b2f19fffa8acd5969cd2cc24ec41c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 22:38:26 +0000 Subject: [PATCH 08/16] python37Packages.aniso8601: 8.0.0 -> 8.1.0 --- pkgs/development/python-modules/aniso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index e5222b64e9b..97e79e4e8eb 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "8.0.0"; + version = "8.1.0"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "529dcb1f5f26ee0df6c0a1ee84b7b27197c3c50fc3a6321d66c544689237d072"; + sha256 = "246bf8d3611527030889e6df970878969d3a2f760ba3eb694fa1fb10e6ce53f9"; }; } From d3419c984c688dffefbe2eba1e068e1fd46b9ba9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 23:02:41 +0000 Subject: [PATCH 09/16] python37Packages.cocotb: 1.3.2 -> 1.4.0 --- pkgs/development/python-modules/cocotb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 300376b8a64..9e6ebbe260e 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0akkxcj11543c0jn4zdw4a668lk0xg7pghs8mch3xjk8nn8wfblc"; + sha256 = "0fv0mg8zh40ffq0q39s195y6hvjrzihpx0i3f7ba5881syw3x7p4"; }; propagatedBuildInputs = [ From e9ade83e7af1a996f761d609de3f9ca625875dc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 20:48:59 +0000 Subject: [PATCH 10/16] python37Packages.alerta: 8.0.0 -> 8.2.0 --- pkgs/development/python-modules/alerta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 579f0178729..71463efb914 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "8.0.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "49e0862c756d644e9349f5040dd59d135cd871ffeaea5fc288eb3a2e818cf61a"; + sha256 = "a689b2551655ffeb1fa0af2b652653c9355e4f612a3cb8265fcb53c47f83f7c0"; }; propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; From 23290bd131fe33cb5844a9722662e8c458811ce3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 21:56:03 +0000 Subject: [PATCH 11/16] python37Packages.azure-mgmt-network: 16.0.0 -> 17.0.0 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index da1ec78a8c9..95bcd9dbc40 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "16.0.0"; + version = "17.0.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6159a8c44590cc58841690c27c7d4acb0cd9ad0a1e5178c1d35e0f48e3c3c0e9"; + sha256 = "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; }; propagatedBuildInputs = [ From a35e7daa2b4aa70f7f8ed857f276ad33593bd322 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 7 Dec 2020 22:03:47 +0100 Subject: [PATCH 12/16] =?UTF-8?q?compcert:=203.7=20=E2=86=92=203.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compilers/compcert/default.nix | 47 +++++++++++++------ pkgs/top-level/coq-packages.nix | 8 +++- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 3dea91970e2..99bd09d8d9e 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,36 +1,52 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper -, coq, ocamlPackages, coq2html +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper +, coqPackages, ocamlPackages, coq2html , tools ? stdenv.cc +, version ? "3.8" }: let ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ]; ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; + inherit (coqPackages) coq flocq; + inherit (stdenv.lib) optional optionalString; in + +let param = { + "3.7" = { + sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; + patches = [ + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch"; + sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy"; + }) + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch"; + sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc"; + }) + ]; + }; + "3.8" = { + sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + useExternalFlocq = true; + }; +}."${version}"; in + stdenv.mkDerivation rec { pname = "compcert"; - version = "3.7"; + inherit version; src = fetchFromGitHub { owner = "AbsInt"; repo = "CompCert"; rev = "v${version}"; - sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; + inherit (param) sha256; }; - patches = [ - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch"; - sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy"; - }) - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch"; - sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc"; - }) - ]; + patches = param.patches or []; nativeBuildInputs = [ makeWrapper ]; buildInputs = ocaml-pkgs ++ [ coq coq2html ]; + propagatedBuildInputs = optional (param.useExternalFlocq or false) flocq; enableParallelBuilding = true; postPatch = '' @@ -43,6 +59,7 @@ stdenv.mkDerivation rec { -prefix $out \ -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ -toolprefix ${tools}/bin/ \ + ${optionalString (param.useExternalFlocq or false) "-use-external-Flocq"} \ ${ccomp-platform} ''; @@ -68,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Formally verified C compiler"; - homepage = "http://compcert.inria.fr"; + homepage = "https://compcert.org"; license = licenses.inria-compcert; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 605db554363..46b7094cb3a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,4 +1,6 @@ -{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 }: +{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 +, compcert +}: let mkCoqPackages' = self: coq: @@ -59,7 +61,9 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST {}; + VST = callPackage ../development/coq-modules/VST { + compcert = compcert.override { version = "3.7"; }; + }; filterPackages = filterCoqPackages; }; From 563ff4adf9b0c25453d4b6448da14524eb91458e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Dec 2020 07:06:04 +1000 Subject: [PATCH 13/16] kubernetes: misc fixes - don't install unnecessary binaries - remove go-bindata, already vendored by upstream - use installShellFiles, add kubeadm completion - require kubeadm/kubectl so installPhase can't be broken --- .../networking/cluster/kubernetes/default.nix | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 9a8bbe09a50..cdda1487a49 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,7 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync +{ stdenv +, lib +, fetchFromGitHub +, removeReferencesTo +, which +, go +, makeWrapper +, rsync +, installShellFiles + , components ? [ - "cmd/kubeadm" - "cmd/kubectl" "cmd/kubelet" "cmd/kube-apiserver" "cmd/kube-controller-manager" @@ -11,8 +18,6 @@ ] }: -with lib; - stdenv.mkDerivation rec { pname = "kubernetes"; version = "1.19.4"; @@ -24,9 +29,9 @@ stdenv.mkDerivation rec { sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi"; }; - nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; + nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; - outputs = ["out" "man" "pause"]; + outputs = [ "out" "man" "pause" ]; postPatch = '' # go env breaks the sandbox @@ -41,7 +46,10 @@ stdenv.mkDerivation rec { patchShebangs ./hack ''; - WHAT=concatStringsSep " " components; + WHAT = lib.concatStringsSep " " ([ + "cmd/kubeadm" + "cmd/kubectl" + ] ++ components); postBuild = '' ./hack/update-generated-docs.sh @@ -49,11 +57,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin" + for p in $WHAT; do + install -D _output/local/go/bin/''${p##*/} -t $out/bin + done - cp _output/local/go/bin/* "$out/bin/" - cp build/pause/pause "$pause/bin/pause" - cp -R docs/man/man1 "$man/share/man" + install -D build/pause/pause -t $pause/bin + installManPage docs/man/man1/*.[1-9] cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons patchShebangs $out/bin/kube-addons @@ -61,19 +70,22 @@ stdenv.mkDerivation rec { cp ${./mk-docker-opts.sh} $out/bin/mk-docker-opts.sh - $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl - $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl + for tool in kubeadm kubectl; do + installShellCompletion --cmd $tool \ + --bash <($out/bin/$tool completion bash) \ + --zsh <($out/bin/$tool completion zsh) + done ''; preFixup = '' find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + ''; - meta = { + meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = "https://kubernetes.io"; - maintainers = with maintainers; [johanot offline saschagrunert]; + maintainers = with maintainers; [ johanot offline saschagrunert ]; platforms = platforms.unix; }; } From d183736d699bf65c1fbf5b3b7bbfac2f28d726cd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Dec 2020 08:46:57 +1000 Subject: [PATCH 14/16] kubectl: use installShellFiles --- .../networking/cluster/kubectl/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index fed40523a9b..c550a0e2f2b 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -1,27 +1,24 @@ -{ stdenv, kubernetes }: +{ stdenv, kubernetes, installShellFiles }: stdenv.mkDerivation { name = "kubectl-${kubernetes.version}"; # kubectl is currently part of the main distribution but will eventially be # split out (see homepage) - src = kubernetes; + dontUnpack = true; + + nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" "man" ]; installPhase = '' - mkdir -p \ - "$out/bin" \ - "$out/share/bash-completion/completions" \ - "$out/share/zsh/site-functions" \ - "$man/share/man/man1" + install -D ${kubernetes}/bin/kubectl -t $out/bin - cp bin/kubectl $out/bin/kubectl + installManPage "${kubernetes.man}/share/man/man1"/kubectl* - cp "${kubernetes.man}/share/man/man1"/kubectl* "$man/share/man/man1" - - $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl - $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl + installShellCompletion --cmd kubectl \ + --bash <($out/bin/kubectl completion bash) \ + --zsh <($out/bin/kubectl completion zsh) ''; meta = kubernetes.meta // { From 5bdcc31616950fb8ba7870ec49b4cbb50dd2f329 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 9 Dec 2020 11:04:14 +0100 Subject: [PATCH 15/16] amsn: remove application --- .../instant-messengers/amsn/default.nix | 28 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/amsn/default.nix diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix deleted file mode 100644 index 60d4ec829cc..00000000000 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}: - -stdenv.mkDerivation { - name = "amsn-0.98.9"; - src = fetchurl { - url = "mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz"; - sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; - }; - - configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - "--enable-static" - ]; - - buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; - - postInstall = '' - wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin - ''; - - meta = { - description = "Instant messaging (MSN Messenger clone)"; - homepage = "http://amsn-project.net"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99d7fadeb85..8d4fab92a52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20256,8 +20256,6 @@ in ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; - amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { buildFHSUserEnv = buildFHSUserEnvBubblewrap; From ace04464b6a055d50e621447a7ae5580eed3a669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Dec 2020 11:07:28 +0100 Subject: [PATCH 16/16] knot-resolver: 5.2.0 -> 5.2.1 https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.2.1 --- pkgs/servers/dns/knot-resolver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 2ec9a6dfdd9..9e09a11e712 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "8824267ca3331fa06d418c1351b68c648da0af121bcbc84c6e08f5b1e28d9433"; + sha256 = "aa37b744c400f437acba7a54aebcbdbe722ece743d342cbc39f2dd8087f05826"; }; outputs = [ "out" "dev" ]; @@ -30,8 +30,8 @@ unwrapped = stdenv.mkDerivation rec { postPatch = '' patch meson.build <