diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 00:01:36 +0000 |
| commit | dc802b2e196f95ce42daa7591e475bba34047331 (patch) | |
| tree | e490c9bceea445e1eff80d7e883b5621e2c29bec /nixos | |
| parent | e15af378fb53182b63f645c34e4f01cc5879912c (diff) | |
| parent | d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 (diff) | |
| download | nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.gz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.bz2 nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.lz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.xz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.zst nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
4 files changed, 4 insertions, 5 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3c4708cd412..b5d99a15e02 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -7,7 +7,7 @@ <itemizedlist spacing="compact"> <listitem> <para> - Support is planned until the end of April 2022, handing over to + Support is planned until the end of June 2022, handing over to 22.05. </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 08ecabec122..9a0e5eda128 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- Support is planned until the end of April 2022, handing over to 22.05. +- Support is planned until the end of June 2022, handing over to 22.05. ## Highlights {#sec-release-21.11-highlights} diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 2f0b573e872..70d85a97f3b 100644 --- a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -105,7 +105,7 @@ let pkgs.stdenv.mkDerivation { name = "hercules-ci-check-system-nix-src"; inherit (config.nix.package) src patches; - configurePhase = ":"; + dontConfigure = true; buildPhase = '' echo "Checking in-memory pathInfoCache expiry" if ! grep 'PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index 556f6bbb419..9d083a615a2 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -54,8 +54,7 @@ stdenv.mkDerivation { ${addAllNetDev netDevices} ''; - installPhase = ":"; - + dontInstall = true; dontStrip = true; dontPatchELF = true; |