From 9e7a775e2578e126dddb1c6f7514874265e3d08e Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sun, 28 Apr 2024 21:30:47 +0200 Subject: yeet the nix flakes this is, in the widest possible sense, a revert of e88fed18f499a3e8ac98c772bbb62f00d1f8d1d7, which was now a little over two years ago. Of course, lots of things have changed since then: - this uses npins instead of niv, which is both simpler and still maintained - i haven't brought back the old deploy lib; I still use deploy-rs (with some modifications) to deploy things - if you actually use my stuff downstream, you can now use packages/ & tests/ & modules/ as entry points directly, while still having some control over inputs - (since i also don't believe any downstream users actually exist, i've not bothered to have a shim flake.nix so your stuff probably just broke. well, it was an experimental feature, anyways) - in general there's a lot more of the old-fashioned structure back again, with default.nix files in subdirectories that form a structure, not like how almost everything was just imported in the one big flake.nix file For people who are interested in also having a non-flake config similar to this one, it's probably best to take a look at inputs.nix (and also at npins, of course) --- flake.lock | 520 ------------------------------------------------------------- 1 file changed, 520 deletions(-) delete mode 100644 flake.lock (limited to 'flake.lock') diff --git a/flake.lock b/flake.lock deleted file mode 100644 index d52230b..0000000 --- a/flake.lock +++ /dev/null @@ -1,520 +0,0 @@ -{ - "nodes": { - "almanac": { - "flake": false, - "locked": { - "lastModified": 1679514360, - "narHash": "sha256-sCAaGFNGzb51+v/JLBW5Rp5RaHr+3drlaw56y36YBCA=", - "ref": "refs/heads/master", - "rev": "cdd82b013777324f146c4961b866154a9287110b", - "revCount": 61, - "type": "git", - "url": "https://stuebinm.eu/git/forks/almanac" - }, - "original": { - "type": "git", - "url": "https://stuebinm.eu/git/forks/almanac" - } - }, - "bahnhof-name": { - "flake": false, - "locked": { - "lastModified": 1705365694, - "narHash": "sha256-D7zmuc9fz2sYZI4FvA+btOhVsZP3aV37F5L2rq/vu24=", - "ref": "refs/heads/main", - "rev": "0c05c14574ed301c1f80ceeb5edabc34e47feffb", - "revCount": 24, - "type": "git", - "url": "https://stuebinm.eu/git/bahnhof.name" - }, - "original": { - "type": "git", - "url": "https://stuebinm.eu/git/bahnhof.name" - } - }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, - "blog": { - "flake": false, - "locked": { - "lastModified": 1706402379, - "narHash": "sha256-R67pbfZ27q67F9pweDSieYl4wEbIy2yC2cM4rxIuO4k=", - "ref": "refs/heads/main", - "rev": "58e380da3f6cc57bc8673067973d880c209c011c", - "revCount": 47, - "type": "git", - "url": "ssh://cgit/~/blog" - }, - "original": { - "type": "git", - "url": "ssh://cgit/~/blog" - } - }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1710103703, - "narHash": "sha256-DqHB7aQtRCqDeGW4byEQ9yBrRnRidiSOgo2GcRSmN8Y=", - "ref": "nom-flag", - "rev": "9001480e03ab8c957716e2bf164bbde605472399", - "revCount": 310, - "type": "git", - "url": "https://stuebinm.eu/git/forks/deploy-rs" - }, - "original": { - "ref": "nom-flag", - "type": "git", - "url": "https://stuebinm.eu/git/forks/deploy-rs" - } - }, - "feeds": { - "flake": false, - "locked": { - "lastModified": 1691005375, - "narHash": "sha256-t/2lssXYZ2wecGp+N5T54IEKIUJLxsv5gf4AGZ0FudM=", - "path": "/home/stuebinm/org/nonpublic.nix", - "type": "path" - }, - "original": { - "path": "/home/stuebinm/org/nonpublic.nix", - "type": "path" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gtfsBooks": { - "flake": false, - "locked": { - "lastModified": 1655157692, - "narHash": "sha256-Uy2TdvrZjFMa2fzvFlXZ7AhPxnMM4Ss5tgxLHVWX/Rw=", - "ref": "main", - "rev": "2a9d4fcf48b872aef1343f71dfddf44946fd8eb5", - "revCount": 18, - "type": "git", - "url": "https://stuebinm.eu/git/forks/gtfs-books" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://stuebinm.eu/git/forks/gtfs-books" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, - "isabelle-utils": { - "flake": false, - "locked": { - "lastModified": 1635264830, - "narHash": "sha256-AsubIRh3QsuPzp/vs12BHuZ1FCIW3zTfp+f17f2PN4k=", - "ref": "refs/heads/master", - "rev": "e7427d5c67c0a90c369adecb4b0c65c043cb2e34", - "revCount": 17, - "type": "git", - "url": "https://stuebinm.eu/git/isabelle-utils" - }, - "original": { - "type": "git", - "url": "https://stuebinm.eu/git/isabelle-utils" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1713128889, - "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "ntfy-matrix-bot": { - "flake": false, - "locked": { - "lastModified": 1711577402, - "narHash": "sha256-O8xtbOhrXiJhteEOcYYXqXuA/edkebg0GERBcZ3mH/w=", - "ref": "refs/heads/main", - "rev": "bade89a506c380a7d4cab4fdd765e28686c14776", - "revCount": 1, - "type": "git", - "url": "https://stuebinm.eu/git/ntfy-matrix-bot" - }, - "original": { - "type": "git", - "url": "https://stuebinm.eu/git/ntfy-matrix-bot" - } - }, - "playground": { - "flake": false, - "locked": { - "lastModified": 1682694042, - "narHash": "sha256-c3lC31iR1CPi8A8nV8ZjMtpt0cUACz4V4LUBd4awQOs=", - "ref": "refs/heads/master", - "rev": "19144f12772063b1c6f00ad186dabbf53ea25985", - "revCount": 25, - "type": "git", - "url": "https://stuebinm.eu/git/playground" - }, - "original": { - "type": "git", - "url": "https://stuebinm.eu/git/playground" - } - }, - "root": { - "inputs": { - "almanac": "almanac", - "bahnhof-name": "bahnhof-name", - "blog": "blog", - "deploy-rs": "deploy-rs", - "feeds": "feeds", - "gtfsBooks": "gtfsBooks", - "home-manager": "home-manager", - "isabelle-utils": "isabelle-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", - "ntfy-matrix-bot": "ntfy-matrix-bot", - "playground": "playground", - "rust-overlay": "rust-overlay", - "showrt": "showrt", - "simple-nixos-mailserver": "simple-nixos-mailserver", - "sops-nix": "sops-nix", - "tracktrain": "tracktrain", - "traveltext": "traveltext", - "uplcg": "uplcg", - "walint": "walint" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713150335, - "narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b186d85e747e2b7bee220ec95839fb66c868dc47", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "showrt": { - "flake": false, - "locked": { - "lastModified": 1670187823, - "narHash": "sha256-po1Ef3+KiNSCLX45nUNZHyRntH5bVQTrqi+ZNFaaUCc=", - "ref": "main", - "rev": "7de36af3c6ffcc25832a6ff2303ba6c4c1101de5", - "revCount": 7, - "type": "git", - "url": "https://stuebinm.eu/git/showrt" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://stuebinm.eu/git/showrt" - } - }, - "simple-nixos-mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-23_05": [ - "nixpkgs" - ], - "nixpkgs-23_11": [ - "nixpkgs" - ], - "utils": "utils_2" - }, - "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713174909, - "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tracktrain": { - "flake": false, - "locked": { - "lastModified": 1688154251, - "narHash": "sha256-iv2xUUYhjIcKWs1+l7h43z7v/a9/OamBKXi/gcl4ppI=", - "ref": "main", - "rev": "a995dabf07574a32c1ae62ad23b96ba7d8e076ee", - "revCount": 92, - "type": "git", - "url": "https://stuebinm.eu/git/tracktrain" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://stuebinm.eu/git/tracktrain" - } - }, - "traveltext": { - "flake": false, - "locked": { - "lastModified": 1681684407, - "narHash": "sha256-lSrfRmnFVOwlX/dvLRjFB0P6XdSX+rHnkv5IQ/Ccjmc=", - "ref": "main", - "rev": "b6080abc5661f9323593944f5701d7dd7597afb9", - "revCount": 20, - "type": "git", - "url": "https://stuebinm.eu/git/traveltext" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://stuebinm.eu/git/traveltext" - } - }, - "uplcg": { - "flake": false, - "locked": { - "lastModified": 1687024567, - "narHash": "sha256-SdAnUQwHxK/8CZpjxB/s0zMeO453nZzh6JABvl/55Rg=", - "ref": "main", - "rev": "b61c0b191578d6ed39a6038cca7b436764a1f9f1", - "revCount": 124, - "type": "git", - "url": "https://stuebinm.eu/git/forks/uplcg" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://stuebinm.eu/git/forks/uplcg" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "walint": { - "flake": false, - "locked": { - "lastModified": 1646586788, - "narHash": "sha256-33qvc6ZIJzBb7NUz7FHLAzAZ9rg/hGnLqKMjIXgUqdM=", - "ref": "playground", - "rev": "6b71528e72458bcb5e0a0089033b9367c887967f", - "revCount": 265, - "type": "git", - "url": "https://stuebinm.eu/git/walint" - }, - "original": { - "ref": "playground", - "type": "git", - "url": "https://stuebinm.eu/git/walint" - } - } - }, - "root": "root", - "version": 7 -} -- cgit v1.2.3