boostrap fetchurl: Add SRI support

This commit is contained in:
Janne Heß 2022-08-23 13:06:54 +02:00
parent f8594cd431
commit 0b3e7f063c
No known key found for this signature in database
GPG key ID: 69165158F05265DF
4 changed files with 15 additions and 3 deletions

View file

@ -1,2 +1,2 @@
# Expose the minimum required version for evaluating Nixpkgs # Expose the minimum required version for evaluating Nixpkgs
"2.2" "2.3"

View file

@ -255,6 +255,11 @@
<section xml:id="sec-release-22.11-incompatibilities"> <section xml:id="sec-release-22.11-incompatibilities">
<title>Backward Incompatibilities</title> <title>Backward Incompatibilities</title>
<itemizedlist> <itemizedlist>
<listitem>
<para>
Nixpkgs now requires Nix 2.3 or newer.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The <literal>isCompatible</literal> predicate checking CPU The <literal>isCompatible</literal> predicate checking CPU

View file

@ -94,6 +94,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
## Backward Incompatibilities {#sec-release-22.11-incompatibilities} ## 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 - The `isCompatible` predicate checking CPU compatibility is no longer exposed
by the platform sets generated using `lib.systems.elaborate`. In most cases by the platform sets generated using `lib.systems.elaborate`. In most cases
you will want to use the new `canExecute` predicate instead which also you will want to use the new `canExecute` predicate instead which also

View file

@ -4,12 +4,17 @@ let mirrors = import ./mirrors.nix; in
{ url ? builtins.head urls { url ? builtins.head urls
, urls ? [] , urls ? []
, sha256 , sha256 ? ""
, hash ? ""
, name ? baseNameOf (toString url) , name ? baseNameOf (toString url)
}: }:
# assert exactly one hash is set
assert hash != "" || sha256 != "";
assert hash != "" -> sha256 == "";
import <nix/fetchurl.nix> { import <nix/fetchurl.nix> {
inherit system sha256 name; inherit system hash sha256 name;
url = url =
# Handle mirror:// URIs. Since <nix/fetchurl.nix> currently # Handle mirror:// URIs. Since <nix/fetchurl.nix> currently