Skip to content

Commit

Permalink
Merge pull request #187884 from helsinki-systems/feat/perl-sri
Browse files Browse the repository at this point in the history
perlPackages: Switch to SRI hashes, add `hash` support to bootstrap fetchurl, bump minimal nix version
  • Loading branch information
stigtsp authored Aug 24, 2022
2 parents f012739 + 071d09d commit 24f160c
Show file tree
Hide file tree
Showing 5 changed files with 1,842 additions and 1,830 deletions.
2 changes: 1 addition & 1 deletion lib/minver.nix
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Expose the minimum required version for evaluating Nixpkgs
"2.2"
"2.3"
5 changes: 5 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,11 @@
<section xml:id="sec-release-22.11-incompatibilities">
<title>Backward Incompatibilities</title>
<itemizedlist>
<listitem>
<para>
Nixpkgs now requires Nix 2.3 or newer.
</para>
</listitem>
<listitem>
<para>
The <literal>isCompatible</literal> predicate checking CPU
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2211.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

## Backward Incompatibilities {#sec-release-22.11-incompatibilities}

- Nixpkgs now requires Nix 2.3 or newer.

- The `isCompatible` predicate checking CPU compatibility is no longer exposed
by the platform sets generated using `lib.systems.elaborate`. In most cases
you will want to use the new `canExecute` predicate instead which also
Expand Down
9 changes: 7 additions & 2 deletions pkgs/build-support/fetchurl/boot.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@ let mirrors = import ./mirrors.nix; in

{ url ? builtins.head urls
, urls ? []
, sha256
, sha256 ? ""
, hash ? ""
, name ? baseNameOf (toString url)
}:

# assert exactly one hash is set
assert hash != "" || sha256 != "";
assert hash != "" -> sha256 == "";

import <nix/fetchurl.nix> {
inherit system sha256 name;
inherit system hash sha256 name;

url =
# Handle mirror:// URIs. Since <nix/fetchurl.nix> currently
Expand Down
Loading

0 comments on commit 24f160c

Please sign in to comment.