From aca670d778ef072e3ea0872224a59c25f5b698aa Mon Sep 17 00:00:00 2001 From: schweby Date: Fri, 5 Feb 2021 23:38:25 +0100 Subject: [PATCH] sources: updated sources --- nix/sources.json | 28 +++++++++++----------- nix/sources.nix | 61 +++++++++++++++--------------------------------- 2 files changed, 33 insertions(+), 56 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 5b1ad19..bea6552 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "91bd34620d73340be03642279ee0d1c64110ee6c", - "sha256": "1pwn2w21rmnk7nqzx9wmgb4k4kph7vfd1r9wcq9xdn7w27cjdg7v", + "rev": "209566c752c4428c7692c134731971193f06b37c", + "sha256": "1canlfkm09ssbgm3hq0kb9d86bdh84jhidxv75g98zq5wgadk7jm", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/91bd34620d73340be03642279ee0d1c64110ee6c.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/209566c752c4428c7692c134731971193f06b37c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -17,17 +17,17 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "3cd7914b2c4cff48927e11c216dadfab7d903fe5", - "sha256": "1agq4nvbhrylf2s77kb4xhh9k7xcwdwggq764k4jgsbs70py8cw3", + "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e", + "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/3cd7914b2c4cff48927e11c216dadfab7d903fe5.tar.gz", + "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nix-hexchen": { "branch": "main", "ref": "main", "repo": "https://gitlab.com/hexchen/nixfiles.git", - "rev": "412491716b9a64dd4f436d9949cb7c26b669519c", + "rev": "c87f132c9d3932e61ddfeea50a6f810a19d41f79", "type": "git" }, "nixos-mailserver": { @@ -45,10 +45,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "85abeab48b5feda4b163e5bb32f50aad1164e415", - "sha256": "1nslb5p6cf5z691pf52j8bf880sdgav1fcf7bxjk3rad92bniq5g", + "rev": "d4c29df154dc6397ea47a7ed7dd0450a46dd4695", + "sha256": "015xcdirr9vh49dszgfb2rayr6mqscmmv2d3dh99ghv8gjcv050y", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/85abeab48b5feda4b163e5bb32f50aad1164e415.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/d4c29df154dc6397ea47a7ed7dd0450a46dd4695.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-unstable": { @@ -57,17 +57,17 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "891f607d5301d6730cb1f9dcf3618bcb1ab7f10e", - "sha256": "1cr39f0sbr0h5d83dv1q34mcpwnkwwbdk5fqlyqp2mnxghzwssng", + "rev": "8c8731330b53ba0061686f36f10f101e662a4717", + "sha256": "0ak4d254myq6cl3d7jkq6n0apxabvwjz62zdw9habnrqg8asl8gk", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/891f607d5301d6730cb1f9dcf3618bcb1ab7f10e.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/8c8731330b53ba0061686f36f10f101e662a4717.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "pbb-nixfiles": { "branch": "main", "ref": "main", "repo": "https://git.petabyte.dev/petabyteboy/nixfiles.git", - "rev": "0720c5dba283d782f2f887bf97aad339137d95dc", + "rev": "65e6159cbab6ba36b985d2ae7495cf68e0233393", "type": "git" } } diff --git a/nix/sources.nix b/nix/sources.nix index b796fff..b64b8f8 100644 --- a/nix/sources.nix +++ b/nix/sources.nix @@ -6,33 +6,25 @@ let # The fetchers. fetch_ fetches specs of type . # - fetch_file = pkgs: name: spec: - 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'; }; + fetch_file = pkgs: spec: + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; } + else + pkgs.fetchurl { inherit (spec) url sha256; }; fetch_tarball = pkgs: name: spec: let - name' = sanitizeName name + "-src"; + ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str); + # sanitize the name, though nix will still fail if name starts with period + name' = stringAsChars (x: if ! ok x then "-" else x) "${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; }; - fetch_git = name: spec: - let - ref = - if spec ? ref then spec.ref else - 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`!"; - in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; + fetch_git = spec: + builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; }; fetch_local = spec: spec.path; @@ -48,21 +40,11 @@ let # Various helpers # - # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 - sanitizeName = name: - ( - concatMapStrings (s: if builtins.isList s then "-" else s) - ( - builtins.split "[^[:alnum:]+._?=-]+" - ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) - ) - ); - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: system: + mkPkgs = sources: let sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; + import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {}; hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; hasThisAsNixpkgsPath = == ./.; in @@ -82,9 +64,9 @@ let if ! builtins.hasAttr "type" spec then abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" then fetch_file pkgs name spec + else if spec.type == "file" then fetch_file pkgs spec else if spec.type == "tarball" then fetch_tarball pkgs name spec - else if spec.type == "git" then fetch_git name spec + else if spec.type == "git" then fetch_git spec else if spec.type == "local" then fetch_local spec else if spec.type == "builtin-tarball" then fetch_builtin-tarball name else if spec.type == "builtin-url" then fetch_builtin-url name @@ -116,29 +98,25 @@ let # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); - concatMapStrings = f: list: concatStrings (map f list); concatStrings = builtins.concatStringsSep ""; - # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 - 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: + builtins_fetchTarball = { url, name, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchTarball; in if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) + fetchTarball { inherit name url; } else fetchTarball attrs; # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { url, name ? null, sha256 }@attrs: + builtins_fetchurl = { url, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchurl; in if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) + fetchurl { inherit url; } else fetchurl attrs; @@ -157,8 +135,7 @@ let mkConfig = { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) - , system ? builtins.currentSystem - , pkgs ? mkPkgs sources system + , pkgs ? mkPkgs sources }: rec { # The sources, i.e. the attribute set of spec name to spec inherit sources;