From c2f109d689d4db78c3cf0209387519c2ab6a2c8c Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Thu, 16 Jan 2025 00:52:52 +0100 Subject: [PATCH] npins --- default.nix | 12 ++----- npins/default.nix | 80 ++++++++++++++++++++++++++++++++++++++++++++++ npins/sources.json | 23 +++++++++++++ 3 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 npins/default.nix create mode 100644 npins/sources.json diff --git a/default.nix b/default.nix index 56732a3..abb2d99 100644 --- a/default.nix +++ b/default.nix @@ -1,14 +1,8 @@ { system ? builtins.currentSystem, - pkgs ? import (builtins.fetchTarball { - url = "https://github.com/nixos/nixpkgs/archive/56c0d09b76608a7fa28127a37d81d9003e46acf6.tar.gz"; - }) { inherit system; }, - papermod ? pkgs.fetchFromGitHub { - owner = "adityatelange"; - repo = "hugo-papermod"; - rev = "master"; - hash = "sha256-Dv/QnYYG5KTQro95kzwgQeOS0nO2HyfBoSou5AsCFAI="; - }, + sources ? import ./npins, + pkgs ? import sources.nixpkgs { inherit system; }, + papermod ? sources.hugo-papermod, }: pkgs.stdenv.mkDerivation { name = "website"; diff --git a/npins/default.nix b/npins/default.nix new file mode 100644 index 0000000..5e7d086 --- /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 0000000..7b52d79 --- /dev/null +++ b/npins/sources.json @@ -0,0 +1,23 @@ +{ + "pins": { + "hugo-papermod": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "adityatelange", + "repo": "hugo-papermod" + }, + "branch": "master", + "revision": "9f1f414be805a2f94e2f51bd4be2b365ff12386d", + "url": "https://github.com/adityatelange/hugo-papermod/archive/9f1f414be805a2f94e2f51bd4be2b365ff12386d.tar.gz", + "hash": "1195j3bha85iyd8ll5x2lrq8y4an52vd2gbfzgcvpxr0lck85a2x" + }, + "nixpkgs": { + "type": "Channel", + "name": "nixpkgs-unstable", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre738273.0bd024d34eb0/nixexprs.tar.xz", + "hash": "1i9krk68w7k19wzhfybmzgxyf9v24bpbr1hrlj840yd4c5hx3fnn" + } + }, + "version": 3 +} \ No newline at end of file