Radish alpha
h
heartwood
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
nix: update for rust-1.74
Fintan Halpenny committed 2 years ago
commit aca5cf669f537522dcd7178e6dbaa62e49be796b
parent 6510705521d3bf8d30929ee5f69f3b2a5fff8a9a
2 files changed +65 -61
modified .nix/sources.json
@@ -5,10 +5,10 @@
        "homepage": "https://github.com/nmattia/niv",

        "owner": "nmattia",

        "repo": "niv",
- 
        "rev": "0ebb80e003c26d5388a9b74645fbdcfca3bdd0ef",
- 
        "sha256": "0wpnk1n4vjyqwjjrm6dvkyh7xr7983rszfhfcg31v106qhfnh41c",
+ 
        "rev": "723f0eeb969a730db3c30f977c2b66b9dce9fe4a",
+ 
        "sha256": "0016l7230gd2kdh0g2w573r9a2krqb7x4ifcjhhsn4h1bwap7qr0",

        "type": "tarball",
- 
        "url": "https://github.com/nmattia/niv/archive/0ebb80e003c26d5388a9b74645fbdcfca3bdd0ef.tar.gz",
+ 
        "url": "https://github.com/nmattia/niv/archive/723f0eeb969a730db3c30f977c2b66b9dce9fe4a.tar.gz",

        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

    },

    "nixpkgs": {
@@ -29,10 +29,10 @@
        "homepage": "",

        "owner": "oxalica",

        "repo": "rust-overlay",
- 
        "rev": "32b17eeafe550935bd5ca1afd1717dcefcb97653",
- 
        "sha256": "0378dq5h67r1rlhq1is9r4cvka70n9lqrk504qq0w5jvcmvbl3yz",
+ 
        "rev": "e17bfe3baa0487f0671c9ed0e9057d10987ba7f7",
+ 
        "sha256": "1kg6kfkc115gcip69vrxz74ryfmh44fdx2480l6qahkgl0d3pzxb",

        "type": "tarball",
- 
        "url": "https://github.com/oxalica/rust-overlay/archive/32b17eeafe550935bd5ca1afd1717dcefcb97653.tar.gz",
+ 
        "url": "https://github.com/oxalica/rust-overlay/archive/e17bfe3baa0487f0671c9ed0e9057d10987ba7f7.tar.gz",

        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

    }

}
modified .nix/sources.nix
@@ -10,33 +10,34 @@ let
    let

      name' = sanitizeName name + "-src";

    in
- 
      if spec.builtin or true then
- 
        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
- 
      else
- 
        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+ 
    if spec.builtin or true then
+ 
      builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+ 
    else
+ 
      pkgs.fetchurl { inherit (spec) url sha256; name = name'; };



  fetch_tarball = pkgs: name: spec:

    let

      name' = sanitizeName name + "-src";

    in
- 
      if spec.builtin or true then
- 
        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
- 
      else
- 
        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+ 
    if spec.builtin or true then
+ 
      builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+ 
    else
+ 
      pkgs.fetchzip { name = name'; inherit (spec) url sha256; };



  fetch_git = name: spec:

    let

      ref =
- 
        if spec ? ref then spec.ref else
+ 
        spec.ref or (

          if spec ? branch then "refs/heads/${spec.branch}" else
- 
            if spec ? tag then "refs/tags/${spec.tag}" else
- 
              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
- 
      submodules = if spec ? submodules then spec.submodules else false;
+ 
          if spec ? tag then "refs/tags/${spec.tag}" else
+ 
          abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+ 
        );
+ 
      submodules = spec.submodules or false;

      submoduleArg =

        let

          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;

          emptyArgWithWarning =
- 
            if submodules == true
+ 
            if submodules

            then

              builtins.trace

                (
@@ -44,15 +45,15 @@ let
                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "

                  + "does not support them"

                )
- 
                {}
- 
            else {};
+ 
                { }
+ 
            else { };

        in
- 
          if nixSupportsSubmodules
- 
          then { inherit submodules; }
- 
          else emptyArgWithWarning;
+ 
        if nixSupportsSubmodules
+ 
        then { inherit submodules; }
+ 
        else emptyArgWithWarning;

    in
- 
      builtins.fetchGit
- 
        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+ 
    builtins.fetchGit
+ 
      ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);



  fetch_local = spec: spec.path;
@@ -86,16 +87,16 @@ let
      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;

      hasThisAsNixpkgsPath = <nixpkgs> == ./.;

    in
- 
      if builtins.hasAttr "nixpkgs" sources
- 
      then sourcesNixpkgs
- 
      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
- 
        import <nixpkgs> {}
- 
      else
- 
        abort
- 
          ''
- 
            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
- 
            add a package called "nixpkgs" to your sources.json.
- 
          '';
+ 
    if builtins.hasAttr "nixpkgs" sources
+ 
    then sourcesNixpkgs
+ 
    else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+ 
      import <nixpkgs> { }
+ 
    else
+ 
      abort
+ 
        ''
+ 
          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+ 
          add a package called "nixpkgs" to your sources.json.
+ 
        '';



  # The actual fetching function.

  fetch = pkgs: name: spec:
@@ -115,13 +116,13 @@ let
  # the path directly as opposed to the fetched source.

  replace = name: drv:

    let
- 
      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+ 
      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;

      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";

    in
- 
      if ersatz == "" then drv else
- 
        # this turns the string into an actual Nix path (for both absolute and
- 
        # relative paths)
- 
        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+ 
    if ersatz == "" then drv else
+ 
      # this turns the string into an actual Nix path (for both absolute and
+ 
      # relative paths)
+ 
    if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";



  # Ports of functions for older nix versions
@@ -132,7 +133,7 @@ let
  );



  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
- 
  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+ 
  range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);



  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257

  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@@ -143,43 +144,46 @@ let
  concatStrings = builtins.concatStringsSep "";



  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
- 
  optionalAttrs = cond: as: if cond then as else {};
+ 
  optionalAttrs = cond: as: if cond then as else { };



  # fetchTarball version that is compatible between all the versions of Nix

  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:

    let

      inherit (builtins) lessThan nixVersion fetchTarball;

    in
- 
      if lessThan nixVersion "1.12" then
- 
        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
- 
      else
- 
        fetchTarball attrs;
+ 
    if lessThan nixVersion "1.12" then
+ 
      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+ 
    else
+ 
      fetchTarball attrs;



  # fetchurl version that is compatible between all the versions of Nix

  builtins_fetchurl = { url, name ? null, sha256 }@attrs:

    let

      inherit (builtins) lessThan nixVersion fetchurl;

    in
- 
      if lessThan nixVersion "1.12" then
- 
        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
- 
      else
- 
        fetchurl attrs;
+ 
    if lessThan nixVersion "1.12" then
+ 
      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+ 
    else
+ 
      fetchurl attrs;



  # Create the final "sources" from the config

  mkSources = config:
- 
    mapAttrs (
- 
      name: spec:
- 
        if builtins.hasAttr "outPath" spec
- 
        then abort
- 
          "The values in sources.json should not have an 'outPath' attribute"
- 
        else
- 
          spec // { outPath = replace name (fetch config.pkgs name spec); }
- 
    ) config.sources;
+ 
    mapAttrs
+ 
      (
+ 
        name: spec:
+ 
          if builtins.hasAttr "outPath" spec
+ 
          then
+ 
            abort
+ 
              "The values in sources.json should not have an 'outPath' attribute"
+ 
          else
+ 
            spec // { outPath = replace name (fetch config.pkgs name spec); }
+ 
      )
+ 
      config.sources;



  # The "config" used by the fetchers

  mkConfig =

    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
- 
    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+ 
    , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)

    , system ? builtins.currentSystem

    , pkgs ? mkPkgs sources system

    }: rec {
@@ -191,4 +195,4 @@ let
    };



in
- 
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
+ 
mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }