diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-21 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 18:01:07 +0000 |
| commit | 18ad263272038fdf1c1634e2b51a64284ef4957c (patch) | |
| tree | e7f4385a30b50370bf03e05846e50c59a087b59b /pkgs/build-support | |
| parent | c68c4b3db87877e2ae520ffea2583ae35a0cb04d (diff) | |
| parent | 54962ddabc4cb652ab617a250ed4dc0bec54d1e3 (diff) | |
| download | nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.tar nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.tar.gz nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.tar.bz2 nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.tar.lz nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.tar.xz nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.tar.zst nixpkgs-18ad263272038fdf1c1634e2b51a64284ef4957c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 3ab4be4d8be..e4d6f02a94b 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -151,6 +151,7 @@ cpan = [ "https://cpan.metacpan.org/" "https://cpan.perl.org/" + "https://mirrors.kernel.org/CPAN/" "https://backpan.perl.org/" # for old releases ]; @@ -171,6 +172,7 @@ debian = [ "https://httpredir.debian.org/debian/" "https://ftp.debian.org/debian/" + "https://mirrors.edge.kernel.org/debian/" "ftp://ftp.de.debian.org/debian/" "ftp://ftp.fr.debian.org/debian/" "ftp://ftp.nl.debian.org/debian/" @@ -183,6 +185,7 @@ ubuntu = [ "https://nl.archive.ubuntu.com/ubuntu/" "https://old-releases.ubuntu.com/ubuntu/" + "https://mirrors.edge.kernel.org/ubuntu/" "http://de.archive.ubuntu.com/ubuntu/" "http://archive.ubuntu.com/ubuntu/" ]; @@ -206,6 +209,7 @@ "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" "https://ftp.opensuse.org/pub/opensuse/distribution/" "https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" + "https://mirrors.edge.kernel.org/opensuse/distribution/" "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" ]; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 2966675be7c..3c9f3189d2c 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -749,7 +749,7 @@ rec { { package, command ? "${package.meta.mainProgram or package.pname or package.name} --version", version ? package.version, - }: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' + }: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' ${command} |& grep -Fw ${version} touch $out ''; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 09a56fda7b7..3f176db36c2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -5,7 +5,7 @@ , storeDir ? builtins.storeDir , rootModules ? [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] - ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" + ++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos" }: let |