diff options
| -rw-r--r-- | nix/sources.json | 110 | ||||
| -rw-r--r-- | nix/sources.nix | 198 | ||||
| -rw-r--r-- | npins/default.nix | 80 | ||||
| -rw-r--r-- | npins/sources.json | 95 | ||||
| -rw-r--r-- | shell.nix | 2 | ||||
| -rw-r--r-- | user/settings/nix.nix | 2 |
6 files changed, 177 insertions, 310 deletions
diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index 026a86c9..00000000 --- a/nix/sources.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "agenix": { - "branch": "main", - "description": "age-encrypted secrets for NixOS and Home manager", - "homepage": "https://matrix.to/#/#agenix:nixos.org", - "owner": "ryantm", - "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", - "sha256": "0z26jj4pwliz6v5fdgnwc5fsihjdsy2gz49fcivr4p4178fw4gnr", - "type": "tarball", - "url": "https://github.com/ryantm/agenix/archive/8d37c5bdeade12b6479c85acd133063ab53187a0.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "darwin": { - "branch": "master", - "description": "nix modules for darwin", - "homepage": "", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "e1cacc63e6e324ae95e65e8aaea62dec74686208", - "sha256": "0mn13cq3nwf3m8rpbgss4nc74p7nh7p190z3d6ad9wx425szk8nw", - "type": "tarball", - "url": "https://github.com/lnl7/nix-darwin/archive/e1cacc63e6e324ae95e65e8aaea62dec74686208.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "emacs-overlay": { - "branch": "master", - "description": "Bleeding edge emacs overlay [maintainer=@adisbladis] ", - "homepage": "", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "cc961816f69f9d3b4a0a62e8f56dd6bfd6f6c69b", - "sha256": "0chirpnx9s7rwfj0sjmxz7ghhffp677vpni8lzcd7nbg10vq1nqq", - "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/cc961816f69f9d3b4a0a62e8f56dd6bfd6f6c69b.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "home-manager": { - "branch": "master", - "description": "Manage a user environment using Nix [maintainer=@rycee] ", - "homepage": "https://nix-community.github.io/home-manager/", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", - "sha256": "1cp8p31yg8lzma6hydc0qzgd4l7a919cxvgigmmzqy7ggwrp5njv", - "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/e3ad5108f54177e6520535768ddbf1e6af54b59d.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "nix-index-database": { - "branch": "main", - "description": "Weekly updated nix-index database [maintainer=@Mic92]", - "homepage": "", - "owner": "Mic92", - "repo": "nix-index-database", - "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", - "sha256": "08nksa0fz5mxb1q9fdv5zyshj7mdy6ixfcx0an33bfyk3yij483w", - "type": "tarball", - "url": "https://github.com/Mic92/nix-index-database/archive/e0638db3db43b582512a7de8c0f8363a162842b9.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "nixos-hardware": { - "branch": "master", - "description": "A collection of NixOS modules covering hardware quirks.", - "homepage": "", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", - "sha256": "1dk5m5ksvalw6gs30npvgw20zb6iyy3m5qn8iidcps96gq3bab8l", - "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/d9e0b26202fd500cf3e79f73653cce7f7d541191.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "nixpkgs": { - "branch": "nixos-unstable", - "description": "Nix Packages collection & NixOS", - "homepage": "", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", - "sha256": "1wxx1h7w47gpg7lkycz51dlrwcm1wb2vcmdbjq3gyhjbxd9hz35j", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6c0b7a92c30122196a761b440ac0d46d3d9954f1.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "nixpkgs-overlays": { - "path": "overlays", - "type": "local" - }, - "nur": { - "branch": "master", - "description": "Nix User Repository: User contributed nix packages [maintainer=@Mic92]", - "homepage": "https://nur.nix-community.org/", - "owner": "nix-community", - "repo": "NUR", - "rev": "ffa207f853f35d25f8eb247ed78a9ed9a5abda1a", - "sha256": "0gd3x5ssx4xaykf90lp62iimx9860j3rxcg9wh4jmxw0sqn8aak5", - "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/ffa207f853f35d25f8eb247ed78a9ed9a5abda1a.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "personal": { - "path": "packages", - "type": "local" - }, - "private": { - "path": "private", - "type": "local" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index fe3dadf7..00000000 --- a/nix/sources.nix +++ /dev/null @@ -1,198 +0,0 @@ -# This file has been generated by Niv. - -let - - # - # The fetchers. fetch_<type> fetches specs of type <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_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; }; - - fetch_git = name: spec: - let - ref = - 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 = spec.submodules or false; - submoduleArg = - let - nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0; - emptyArgWithWarning = - if submodules - then - builtins.trace - ( - "The niv input \"${name}\" uses submodules " - + "but your nix's (${builtins.nixVersion}) builtins.fetchGit " - + "does not support them" - ) - { } - else { }; - in - if nixSupportsSubmodules - then { inherit submodules; } - else emptyArgWithWarning; - in - builtins.fetchGit - ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); - - fetch_local = spec: spec.path; - - fetch_builtin-tarball = name: throw - ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=tarball -a builtin=true''; - - fetch_builtin-url = name: throw - ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=file -a builtin=true''; - - # - # 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: - let - sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; - 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. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - - 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 == "tarball" then fetch_tarball pkgs name spec - else if spec.type == "git" then fetch_git name 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 - else - abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # If the environment variable NIV_OVERRIDE_${name} is set, then use - # the path directly as opposed to the fetched source. - replace = name: drv: - let - 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}"; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = builtins.mapAttrs or ( - f: set: with builtins; - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) - ); - - # 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); - - # 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)); - - # 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: - let - inherit (builtins) lessThan nixVersion fetchTarball; - in - 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 (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; - - # The "config" used by the fetchers - mkConfig = - { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile) - , system ? builtins.currentSystem - , pkgs ? mkPkgs sources system - }: rec { - # The sources, i.e. the attribute set of spec name to spec - inherit sources; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; - -in -mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/npins/default.nix b/npins/default.nix new file mode 100644 index 00000000..5e7d086e --- /dev/null +++ b/npins/default.nix @@ -0,0 +1,80 @@ +# Generated by npins. Do not modify; will be overwritten regularly +let + data = builtins.fromJSON (builtins.readFile ./sources.json); + version = data.version; + + mkSource = + spec: + assert spec ? type; + let + path = + if spec.type == "Git" then + mkGitSource spec + else if spec.type == "GitRelease" then + mkGitSource spec + else if spec.type == "PyPi" then + mkPyPiSource spec + else if spec.type == "Channel" then + mkChannelSource spec + else + builtins.throw "Unknown source type ${spec.type}"; + in + spec // { outPath = path; }; + + mkGitSource = + { + repository, + revision, + url ? null, + hash, + branch ? null, + ... + }: + assert repository ? type; + # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository + # In the latter case, there we will always be an url to the tarball + if url != null then + (builtins.fetchTarball { + inherit url; + sha256 = hash; # FIXME: check nix version & use SRI hashes + }) + else + assert repository.type == "Git"; + let + urlToName = + url: rev: + let + matched = builtins.match "^.*/([^/]*)(\\.git)?$" repository.url; + + short = builtins.substring 0 7 rev; + + appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else ""; + in + "${if matched == null then "source" else builtins.head matched}${appendShort}"; + name = urlToName repository.url revision; + in + builtins.fetchGit { + url = repository.url; + rev = revision; + inherit name; + # hash = hash; + }; + + mkPyPiSource = + { url, hash, ... }: + builtins.fetchurl { + inherit url; + sha256 = hash; + }; + + mkChannelSource = + { url, hash, ... }: + builtins.fetchTarball { + inherit url; + sha256 = hash; + }; +in +if version == 3 then + builtins.mapAttrs (_: mkSource) data.pins +else + throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`" diff --git a/npins/sources.json b/npins/sources.json new file mode 100644 index 00000000..b1d9dab9 --- /dev/null +++ b/npins/sources.json @@ -0,0 +1,95 @@ +{ + "pins": { + "agenix": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "ryantm", + "repo": "agenix" + }, + "branch": "main", + "revision": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "url": "https://github.com/ryantm/agenix/archive/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9.tar.gz", + "hash": "1lpkwinlax40b7xgzspbkm9rsi4a1x48hxhixnni4irxxwnav0ah" + }, + "darwin": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "lnl7", + "repo": "nix-darwin" + }, + "branch": "master", + "revision": "0bea8222f6e83247dd13b055d83e64bce02ee532", + "url": "https://github.com/lnl7/nix-darwin/archive/0bea8222f6e83247dd13b055d83e64bce02ee532.tar.gz", + "hash": "1df3yr784x0jg6wna3hdri2z0fyzdxf7amaz6b216cigd06bymz4" + }, + "emacs-overlay": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nix-community", + "repo": "emacs-overlay" + }, + "branch": "master", + "revision": "929e09706815a9e10cc749393eaa5895761de32a", + "url": "https://github.com/nix-community/emacs-overlay/archive/929e09706815a9e10cc749393eaa5895761de32a.tar.gz", + "hash": "00g9sb3f0d32jq38aq02bx9glysgkdjs7y906hx9rwzmm2bvd9q4" + }, + "home-manager": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nix-community", + "repo": "home-manager" + }, + "branch": "master", + "revision": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", + "url": "https://github.com/nix-community/home-manager/archive/05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a.tar.gz", + "hash": "0jmwyln74bmq8q0q7bkhw3dz36dcnb1iqhk7ws9vqp8g4i748xjf" + }, + "nix-index-database": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "Mic92", + "repo": "nix-index-database" + }, + "branch": "main", + "revision": "6e4a2b3b7c60aae5dac8c21117a134a4a56648da", + "url": "https://github.com/Mic92/nix-index-database/archive/6e4a2b3b7c60aae5dac8c21117a134a4a56648da.tar.gz", + "hash": "0r3lgbhk74r7795l14yn9g5yvm5izygzx0w309zdg6drns4d8gc3" + }, + "nixos-hardware": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "NixOS", + "repo": "nixos-hardware" + }, + "branch": "master", + "revision": "2e7d6c568063c83355fe066b8a8917ee758de1b8", + "url": "https://github.com/NixOS/nixos-hardware/archive/2e7d6c568063c83355fe066b8a8917ee758de1b8.tar.gz", + "hash": "0z6b44w1sxlxqir7pprs3d26zkim39kqwqlf9jwanzjvgbgrkvkx" + }, + "nixpkgs": { + "type": "Channel", + "name": "nixos-unstable", + "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre630835.bfb7a882678e/nixexprs.tar.xz", + "hash": "04qn48v4vjpxsk00x407v558p3f1x8blwjppk2sswzbjhyn2vgxw" + }, + "nur": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nix-community", + "repo": "NUR" + }, + "branch": "master", + "revision": "ccb21d26b4f6f574561c3d7139960228f7051bd2", + "url": "https://github.com/nix-community/NUR/archive/ccb21d26b4f6f574561c3d7139960228f7051bd2.tar.gz", + "hash": "1lnddszkdgbj8vn143b1gv654wjxx31gkfja17cic8r0fxwzzv41" + } + }, + "version": 3 +} \ No newline at end of file diff --git a/shell.nix b/shell.nix index 8b4f463c..7d5d4227 100644 --- a/shell.nix +++ b/shell.nix @@ -13,7 +13,7 @@ pkgs.mkShell name = "nixfiles-shell"; buildInputs = with pkgs; [ - niv + npins deploy-rs (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { }) (import sources.home-manager { inherit pkgs; }).home-manager diff --git a/user/settings/nix.nix b/user/settings/nix.nix index b194bb42..3d1b953f 100644 --- a/user/settings/nix.nix +++ b/user/settings/nix.nix @@ -17,7 +17,7 @@ in home.packages = with pkgs; [ nil - niv + npins nix-prefetch-scripts nix-init nix-update |