JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-31 12:06:29 +00:00 committed by GitHub
commit 4da7569841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 107 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -636,6 +636,15 @@ environment.systemPackages = [
</programlisting>
</para>
</listitem>
<listitem>
<para>
<option>environment.defaultPackages</option> now includes the nano package.
If <package>pkgs.nano</package> is not added to the list,
make sure another editor is installed and the <literal>EDITOR</literal>
environment variable is set to it.
Environment variables can be set using <option>environment.variables</option>.
</para>
</listitem>
</itemizedlist>
</section>

20
nixos/modules/config/system-path.nix
View File

@ -29,7 +29,6 @@ let
pkgs.xz
pkgs.less
pkgs.libcap
pkgs.nano
pkgs.ncurses
pkgs.netcat
config.programs.ssh.package
@ -43,7 +42,8 @@ let
];
defaultPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
[ pkgs.perl
[ pkgs.nano
pkgs.perl
pkgs.rsync
pkgs.strace
];
@ -75,13 +75,21 @@ in
default = defaultPackages;
example = literalExample "[]";
description = ''
Set of packages users expect from a minimal linux istall.
Like systemPackages, they appear in
/run/current-system/sw. These packages are
Set of default packages that aren't strictly neccessary
for a running system, entries can be removed for a more
minimal NixOS installation.
Note: If <package>pkgs.nano</package> is removed from this list,
make sure another editor is installed and the
<literal>EDITOR</literal> environment variable is set to it.
Environment variables can be set using
<option>environment.variables</option>.
Like with systemPackages, packages are installed to
<filename>/run/current-system/sw</filename>. They are
automatically available to all users, and are
automatically updated every time you rebuild the system
configuration.
If you want a more minimal system, set it to an empty list.
'';
};

4
pkgs/applications/networking/cluster/terraform-docs/default.nix
View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6jUYntnMB/LxyZuRkSaOVcrzJOIoucdaY+5GVHwJL8Y=";
sha256 = "sha256-zQFPuHxfFvfwPVV0vPeA+A6XCw2Vt4tY4S2JBGcqaBQ=";
};
vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk=";

2
pkgs/applications/virtualization/conmon/default.nix
View File

@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
makeFlags = [ "bin/conmon" ];
installPhase = ''
runHook preInstall
install -D bin/conmon -t $out/bin
runHook postInstall
'';
passthru.tests = { inherit (nixosTests) cri-o podman; };

4
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -41,10 +41,13 @@ buildGoModule rec {
BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
buildPhase = ''
runHook preBuild
make binaries docs BUILDTAGS="$BUILDTAGS"
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 bin/* -t $out/bin
for shell in bash fish zsh; do
@ -52,6 +55,7 @@ buildGoModule rec {
done
installManPage docs/*.[1-9]
runHook postInstall
'';
passthru.tests = { inherit (nixosTests) cri-o; };

12
pkgs/applications/virtualization/podman/default.nix
View File

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "podman";
version = "3.0.1";
version = "3.1.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "sha256-+z28Z0KvaJa32+eTGFsNX8g/WVd3BohKoBnNPU/kpWM=";
sha256 = "sha256-Cql9ikk0lo/LeWNykEJSKgfGnBSUU5vOh/zUIEvMapk=";
};
patches = [
@ -48,14 +48,18 @@ buildGoModule rec {
];
buildPhase = ''
runHook preBuild
patchShebangs .
${if stdenv.isDarwin
then "make podman-remote"
else "make podman"}
make docs
runHook postBuild
'';
installPhase = lib.optionalString stdenv.isDarwin ''
installPhase = ''
runHook preInstall
'' + lib.optionalString stdenv.isDarwin ''
mv bin/{podman-remote,podman}
'' + ''
install -Dm555 bin/podman $out/bin/podman
@ -66,6 +70,8 @@ buildGoModule rec {
'' + lib.optionalString stdenv.isLinux ''
install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
'' + ''
runHook postInstall
'';
passthru.tests = { inherit (nixosTests) podman; };

4
pkgs/applications/virtualization/runc/default.nix
View File

@ -35,17 +35,21 @@ buildGoPackage rec {
makeFlags = [ "BUILDTAGS+=seccomp" ];
buildPhase = ''
runHook preBuild
cd go/src/${goPackagePath}
patchShebangs .
make ${toString makeFlags} runc man
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 runc $out/bin/runc
installManPage man/*/*.[1-9]
wrapProgram $out/bin/runc \
--prefix PATH : ${lib.makeBinPath [ procps ]} \
--prefix PATH : /run/current-system/systemd/bin
runHook postInstall
'';
passthru.tests = { inherit (nixosTests) cri-o docker podman; };

24
pkgs/development/coq-modules/odd-order/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, mkCoqDerivation, mathcomp, version ? null }:
with lib;
mkCoqDerivation {
pname = "odd-order";
owner = "math-comp";
release."1.12.0".rev = "mathcomp-odd-order.1.12.0";
release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM=";
inherit version;
defaultVersion = with versions; switch mathcomp.character.version [
{ case = pred.union (isGe "1.10.0") (isEq "dev"); out = "1.12.0"; }
] null;
propagatedBuildInputs = [ mathcomp.character ];
meta = {
description = "Formal proof of the Odd Order Theorem";
maintainers = with maintainers; [ siraben ];
license = licenses.cecill-b;
platforms = platforms.unix;
};
}

4
pkgs/development/tools/ameba/default.nix
View File

@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
sha256 = "sha256-yRahBY2ob3EkBKXZN9K7UqgHM4k5CVOcWG0/oOWQFuk=";
sha256 = "sha256-wtUWmvAm7iTiP8eYgPiRasYjzeCIJCQd3D+8f1kMONA=";
};
meta = with lib; {

4
pkgs/development/tools/buildah/default.nix
View File

@ -45,15 +45,19 @@ buildGoModule rec {
];
buildPhase = ''
runHook preBuild
patchShebangs .
make bin/buildah GIT_COMMIT="unknown"
make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man"
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 bin/buildah $out/bin/buildah
installShellCompletion --bash contrib/completions/bash/buildah
make -C docs install PREFIX="$man"
runHook postInstall
'';
meta = with lib; {

6
pkgs/development/tools/gotestsum/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gotestsum";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
sha256 = "sha256-/DpsB3MS0iPYFSug3RTWOprB8tclVP6v3dbS3mC3S+g=";
sha256 = "sha256-xUDhJLTO3JZ7rlUUzcypUev60qmRK9zOlO2VYeXqT4o=";
};
vendorSha256 = "sha256-AOdWv0PkDi8o5V71DVzAd/sRibbMf3CkqmJGmuxHtuc=";
vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k=";
doCheck = false;

6
pkgs/development/tools/misc/md2man/default.nix → pkgs/development/tools/misc/go-md2man/default.nix
View File

@ -1,10 +1,10 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "go-md2man";
version = "2.0.0";
goPackagePath = "github.com/cpuguy83/go-md2man";
vendorSha256 = null;
src = fetchFromGitHub {
rev = "v${version}";

5
pkgs/development/tools/skopeo/default.nix
View File

@ -35,17 +35,22 @@ buildGoModule rec {
++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ];
buildPhase = ''
runHook preBuild
patchShebangs .
make bin/skopeo docs
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 bin/skopeo -t $out/bin
installManPage docs/*.[1-9]
installShellCompletion --bash completions/bash/skopeo
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/skopeo \
--prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]}
'' + ''
runHook postInstall
'';
meta = with lib; {

2
pkgs/games/asc/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-paragui" "--disable-paraguitest" ];
NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems
NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing"; # I'm too lazy to catch all gcc47-related problems
hardeningDisable = [ "format" ];
buildInputs = [

4
pkgs/servers/monitoring/do-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "do-agent";
version = "3.9.0";
version = "3.9.4";
src = fetchFromGitHub {
owner = "digitalocean";
repo = "do-agent";
rev = version;
sha256 = "sha256-0m2dL7oFF45yR4Vu+AW3ROf16w1iioI5McVauOQA/XQ=";
sha256 = "sha256-h5Bv6Us1NrxhUWBckUcGzh3qDk8yDbkmLnV6ZYDdClU=";
};
buildFlagsArray = ''

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-jvit6Z0SwxjDmpEqojmPUJ3TVmVmW3RC+3tfvG1ev4Q=";
sha256 = "sha256-mq9kwkEeh+kVhiVy/h44oP3Rj819gGQDiMifSb7ryeY=";
};
vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA=";
vendorSha256 = "sha256-YU+t8GVsLYWONezUIB4NUrVxtYOmf/2b5v4v3VSYtBU=";
doCheck = false;

15
pkgs/tools/security/sslscan/default.nix
View File

@ -1,14 +1,18 @@
{ lib, stdenv, fetchFromGitHub, openssl }:
{ lib
, stdenv
, fetchFromGitHub
, openssl
}:
stdenv.mkDerivation rec {
pname = "sslscan";
version = "1.11.13";
version = "2.0.9";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = "${version}-rbsec";
sha256 = "0sa8iw91wi3515lw761j84wagab1x9rxr0mn8m08qj300z2044yk";
rev = version;
sha256 = "0594svwz4pya0syibar0ahmi5zdjbwd5kg6hrlhfpmmslrsyli6m";
};
buildInputs = [ openssl ];
@ -18,8 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tests SSL/TLS services and discover supported cipher suites";
homepage = "https://github.com/rbsec/sslscan";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ fpletz globin ];
platforms = platforms.all;
};
}

4
pkgs/tools/virtualization/cri-tools/default.nix
View File

@ -22,16 +22,20 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
buildPhase = ''
runHook preBuild
make binaries VERSION=${version}
runHook postBuild
'';
installPhase = ''
runHook preInstall
make install BINDIR=$out/bin
for shell in bash fish zsh; do
$out/bin/crictl completion $shell > crictl.$shell
installShellCompletion crictl.$shell
done
runHook postInstall
'';
meta = with lib; {

9
pkgs/top-level/all-packages.nix
View File

@ -8364,12 +8364,7 @@ in
sshpass = callPackage ../tools/networking/sshpass { };
sslscan = callPackage ../tools/security/sslscan {
openssl = openssl_1_0_2.override {
enableSSL2 = true;
enableSSL3 = true;
};
};
sslscan = callPackage ../tools/security/sslscan { };
sslmate = callPackage ../development/tools/sslmate { };
@ -12872,7 +12867,7 @@ in
mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { };
go-md2man = callPackage ../development/tools/misc/md2man {};
go-md2man = callPackage ../development/tools/misc/go-md2man {};
mage = callPackage ../development/tools/build-managers/mage { };

1
pkgs/top-level/coq-packages.nix
View File

@ -58,6 +58,7 @@ let
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
metalib = callPackage ../development/coq-modules/metalib { };
multinomials = callPackage ../development/coq-modules/multinomials {};
odd-order = callPackage ../development/coq-modules/odd-order { };
paco = callPackage ../development/coq-modules/paco {};
paramcoq = callPackage ../development/coq-modules/paramcoq {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};