cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2020-12-09 12:20:10 +00:00 committed by GitHub
commit 4090c86280
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 142 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/networking/cluster/kubectl/default.nix
View file

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

44
pkgs/applications/networking/cluster/kubernetes/default.nix
View file

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

28
pkgs/applications/networking/instant-messengers/amsn/default.nix
View file

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

47
pkgs/development/compilers/compcert/default.nix
View file

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

4
pkgs/development/python-modules/alerta/default.nix
View file

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

4
pkgs/development/python-modules/aniso8601/default.nix
View file

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

4
pkgs/development/python-modules/azure-batch/default.nix
View file

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

4
pkgs/development/python-modules/azure-mgmt-network/default.nix
View file

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

4
pkgs/development/python-modules/cocotb/default.nix
View file

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

4
pkgs/development/python-modules/dependency-injector/default.nix
View file

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

4
pkgs/development/python-modules/pandas/default.nix
View file

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

8
pkgs/servers/dns/knot-resolver/default.nix
View file

@ -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 <<EOF
@@ -50,2 +50,2 @@
-systemd_work_dir = join_paths(prefix, get_option('localstatedir'), 'lib', 'knot-resolver')
-systemd_cache_dir = join_paths(prefix, get_option('localstatedir'), 'cache', 'knot-resolver')
-systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
-systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
+systemd_work_dir = '/var/lib/knot-resolver'
+systemd_cache_dir = '/var/cache/knot-resolver'
EOF

4
pkgs/servers/nosql/cassandra/3.11.nix
View file

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "3.11.4";
sha256 = "11wr0vcps8w8g2sd8qwp1yp8y873c4q32azc041xpi7zqciqwnax";
version = "3.11.9";
sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c";
})

2
pkgs/top-level/all-packages.nix
View file

@ -20257,8 +20257,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;

8
pkgs/top-level/coq-packages.nix
View file

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

47
pkgs/top-level/perl-packages.nix
View file

@ -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";
@ -9884,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";
@ -11531,6 +11563,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";