From db5995518bb689174afab272914ff22937259215 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 02:25:36 +0100 Subject: [PATCH 01/15] Nickel flake --- flake.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 69c52c2..88dba6a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,24 @@ { description = "A few hydra jobs"; inputs = { -#nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11; nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; flake-utils.url = github:numtide/flake-utils; uiua = { url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; }; + nickel = { + url = github:tweag/nickel/stable; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, flake-utils, nixpkgs, uiua }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { packages = { - default = uiua.packages.${system}.default; + uiua = uiua.packages.${system}.default; + nickel = nickel.packages.${system}.default; }; hydraJobs = { inherit (self) packages; From c085792db2b9774f5af9307ed65aaa9cce607e7a Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 02:28:57 +0100 Subject: [PATCH 02/15] Also in output It might help if I add the thing I want a flake to output, to the outputs... --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 88dba6a..b02489a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, flake-utils, nixpkgs, uiua }: - let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + outputs = { self, nixpkgs, uiua, nickel }: + let system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; in { packages = { uiua = uiua.packages.${system}.default; From df71fd5b0703113a90e6396f0805ae08ef3dbb03 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 02:31:42 +0100 Subject: [PATCH 03/15] I should do this during daytime... --- flake.lock | 630 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 3 +- 2 files changed, 623 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index b43d90f..de31fda 100644 --- a/flake.lock +++ b/flake.lock @@ -1,14 +1,27 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1688825073, + "narHash": "sha256-fK2huTDGHJc/oZjZWhMZMAt1nQSuuY6p41Y2pudtJdM=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "5ceeefcbbabf4b510ef8ede121d6dc57d1a1f7f8", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": [ - "uiua", - "flake-utils" - ], + "flake-utils": "flake-utils_2", "nixpkgs": [ - "uiua", + "nickel", "nixpkgs" ], "rust-overlay": "rust-overlay" @@ -27,6 +40,58 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nickel", + "topiary", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": [ + "uiua", + "flake-utils" + ], + "nixpkgs": [ + "uiua", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_5" + }, + "locked": { + "lastModified": 1695511445, + "narHash": "sha256-mnE14re43v3/Jc50Jv0BKPMtEk7FEtDSligP6B5HwlI=", + "owner": "ipetkov", + "repo": "crane", + "rev": "3de322e06fc88ada5e3589dc8a375b73e749f512", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -43,6 +108,70 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -79,7 +208,262 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nickel", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "nickel": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils_3", + "nix-input": "nix-input", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks", + "rust-overlay": "rust-overlay_2", + "topiary": "topiary" + }, + "locked": { + "lastModified": 1700157516, + "narHash": "sha256-j4Tnhef9C+cXQb82bazpYbI4lNE+aTXcb6FrKkcn76o=", + "owner": "tweag", + "repo": "nickel", + "rev": "063d77e46b11c26103d34971071271efc702ed73", + "type": "github" + }, + "original": { + "owner": "tweag", + "ref": "stable", + "repo": "nickel", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1687178632, + "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-input": { + "inputs": { + "flake-compat": "flake-compat_2", + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1694598107, + "narHash": "sha256-JEJSU2O+getWkc+Ql6Dsp72ZGihyZ2Ba7fMdv+ma4TQ=", + "owner": "nixos", + "repo": "nix", + "rev": "b99fdcf8dbb38ec0be0e82f65d1d138ec9e89dda", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1703013332, "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", @@ -95,14 +479,143 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": [ + "nickel", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nickel", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1695576016, + "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nickel": "nickel", + "nixpkgs": "nixpkgs_3", "uiua": "uiua" } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "nickel", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1695003086, + "narHash": "sha256-d1/ZKuBRpxifmUf7FaedCqhy0lyVbqj44Oc2s+P5bdA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b87a14abea512d956f0b89d0d8a1e9b41f3e20ff", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "nickel", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696039808, + "narHash": "sha256-7TbAr9LskWG6ISPhUdyp6zHboT7FsFrME5QsWKybPTA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a4c3c904ab29e04a20d3a6da6626d66030385773", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "nickel", + "topiary", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "topiary", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688351637, + "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1689042658, + "narHash": "sha256-p7cQAFNt5kX19sZvK74CmY0nTrtujpZg6sZUiV1ntAk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d7181bb2237035df17cab9295c95f987f5c527e6", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { "inputs": { "flake-utils": [ "uiua", @@ -159,10 +672,111 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "topiary": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane_2", + "flake-utils": "flake-utils_5", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nickel", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1695289853, + "narHash": "sha256-EgDFjJeGJb36je/be7DXvzvpBYDUaupOiQxtL7bN/+Q=", + "owner": "tweag", + "repo": "topiary", + "rev": "8299a04bf83c4a2774cbbff7a036c022efa939b3", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "topiary", + "type": "github" + } + }, "uiua": { "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_2", + "crane": "crane_3", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index b02489a..7ab64f4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "A few hydra jobs"; inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; - flake-utils.url = github:numtide/flake-utils; uiua = { url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; @@ -12,7 +11,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, uiua, nickel }: + outputs = { self, nixpkgs, uiua, nickel }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { From 344db7696c0592c06077423a52a81ff634308636 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 02:43:45 +0100 Subject: [PATCH 04/15] Might this work? --- flake.lock | 62 ++++++++++++------------------------------------------ flake.nix | 4 +++- 2 files changed, 17 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index de31fda..1be6103 100644 --- a/flake.lock +++ b/flake.lock @@ -19,7 +19,7 @@ "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nickel", "nixpkgs" @@ -43,7 +43,7 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nickel", "topiary", @@ -177,11 +177,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -248,24 +248,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -280,9 +262,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1694529238, @@ -339,7 +321,7 @@ "nickel": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nix-input": "nix-input", "nixpkgs": [ "nixpkgs" @@ -509,7 +491,6 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nickel": "nickel", "nixpkgs": "nixpkgs_3", "uiua": "uiua" @@ -598,7 +579,7 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -732,26 +713,11 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "topiary": { "inputs": { "advisory-db": "advisory-db", "crane": "crane_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nix-filter": "nix-filter", "nixpkgs": [ "nickel", @@ -776,7 +742,7 @@ "uiua": { "inputs": { "crane": "crane_3", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 7ab64f4..e698320 100644 --- a/flake.nix +++ b/flake.nix @@ -15,12 +15,14 @@ let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { - packages = { + packages = rec { uiua = uiua.packages.${system}.default; nickel = nickel.packages.${system}.default; + default = nickel; }; hydraJobs = { inherit (self) packages; + default = packages; }; }; } From 08d286101c0d19895819270b19f072ad10a73b81 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:00:45 +0100 Subject: [PATCH 05/15] Reading up on things tends to help... --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index e698320..b9c6a74 100644 --- a/flake.nix +++ b/flake.nix @@ -15,14 +15,12 @@ let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { - packages = rec { + packages.${system} = rec { uiua = uiua.packages.${system}.default; nickel = nickel.packages.${system}.default; - default = nickel; }; hydraJobs = { inherit (self) packages; - default = packages; }; }; } From b608fdc3e1d29d4c2b614cfea111c63a0ea38c54 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:10:57 +0100 Subject: [PATCH 06/15] idk anymore... --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b9c6a74..94e0bdf 100644 --- a/flake.nix +++ b/flake.nix @@ -15,9 +15,10 @@ let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { - packages.${system} = rec { + packages.${system} = { uiua = uiua.packages.${system}.default; nickel = nickel.packages.${system}.default; + default = self.packages.${system}.nickel; }; hydraJobs = { inherit (self) packages; From 55371ddc75a7417b130725473da6270eb8eb463a Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:17:18 +0100 Subject: [PATCH 07/15] indeed --- flake.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 94e0bdf..9cf3aad 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "A few hydra jobs"; inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; + flake-utils.url = github:numtide/flake-utils; uiua = { url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; @@ -11,17 +12,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, uiua, nickel }: - let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + outputs = { self, nixpkgs, flake-utils, uiua, nickel }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; in { - packages.${system} = { - uiua = uiua.packages.${system}.default; - nickel = nickel.packages.${system}.default; - default = self.packages.${system}.nickel; + packages = { + uiua = uiua.packages.default; + nickel = nickel.packages.default; }; hydraJobs = { inherit (self) packages; }; - }; + }); } From 5507ce643a52f4b951402ab5f219e68eb4b59868 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:18:43 +0100 Subject: [PATCH 08/15] This is still needed --- flake.lock | 62 ++++++++++++++++++++++++++++++++++++++++++------------ flake.nix | 4 ++-- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 1be6103..de31fda 100644 --- a/flake.lock +++ b/flake.lock @@ -19,7 +19,7 @@ "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nickel", "nixpkgs" @@ -43,7 +43,7 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nickel", "topiary", @@ -177,11 +177,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -248,6 +248,24 @@ "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -262,9 +280,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -321,7 +339,7 @@ "nickel": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nix-input": "nix-input", "nixpkgs": [ "nixpkgs" @@ -491,6 +509,7 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "nickel": "nickel", "nixpkgs": "nixpkgs_3", "uiua": "uiua" @@ -579,7 +598,7 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -713,11 +732,26 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "topiary": { "inputs": { "advisory-db": "advisory-db", "crane": "crane_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nix-filter": "nix-filter", "nixpkgs": [ "nickel", @@ -742,7 +776,7 @@ "uiua": { "inputs": { "crane": "crane_3", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 9cf3aad..44e1d9a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,8 @@ let pkgs = import nixpkgs { inherit system; }; in { packages = { - uiua = uiua.packages.default; - nickel = nickel.packages.default; + uiua = uiua.packages.${system}.default; + nickel = nickel.packages.${system}.default; }; hydraJobs = { inherit (self) packages; From f2e9c12002fe2995d78409099c48799e0659e7b2 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:19:22 +0100 Subject: [PATCH 09/15] With default maybe... --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 44e1d9a..79fd23e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,8 @@ let pkgs = import nixpkgs { inherit system; }; in { packages = { - uiua = uiua.packages.${system}.default; - nickel = nickel.packages.${system}.default; + #uiua = uiua.packages.${system}.default; + default = nickel.packages.${system}.default; }; hydraJobs = { inherit (self) packages; From 39683d94ada4c86f9181b01eccc921b55e44ef4f Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:25:41 +0100 Subject: [PATCH 10/15] idk --- flake.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 79fd23e..405b408 100644 --- a/flake.nix +++ b/flake.nix @@ -13,15 +13,15 @@ }; }; outputs = { self, nixpkgs, flake-utils, uiua, nickel }: - flake-utils.lib.eachDefaultSystem (system: - let pkgs = import nixpkgs { inherit system; }; - in { - packages = { - #uiua = uiua.packages.${system}.default; - default = nickel.packages.${system}.default; - }; - hydraJobs = { - inherit (self) packages; - }; - }); + flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; + in { + packages = { + #uiua = uiua.packages.${system}.default; + default = nickel.packages.${system}.default; + }; + hydraJobs = { + inherit (self) packages; + }; + }); } From b3cb66f1a204f8b336f5f3dcbcf9e72ffae7a2fc Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:27:57 +0100 Subject: [PATCH 11/15] Next attempt --- flake.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 405b408..9e8c460 100644 --- a/flake.nix +++ b/flake.nix @@ -7,18 +7,18 @@ url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; }; - nickel = { - url = github:tweag/nickel/stable; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #nickel = { + # url = github:tweag/nickel/stable; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; - outputs = { self, nixpkgs, flake-utils, uiua, nickel }: + outputs = { self, nixpkgs, flake-utils, uiua }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; in { packages = { - #uiua = uiua.packages.${system}.default; - default = nickel.packages.${system}.default; + default = uiua.packages.${system}.default; + #default = nickel.packages.${system}.default; }; hydraJobs = { inherit (self) packages; From e3cd3c0ef0605c293ec3dffcd19a4c008dcd1650 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:30:04 +0100 Subject: [PATCH 12/15] baffled --- flake.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 9e8c460..641936e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,18 +7,18 @@ url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; }; - #nickel = { - # url = github:tweag/nickel/stable; - # inputs.nixpkgs.follows = "nixpkgs"; - #}; + nickel = { + url = github:tweag/nickel/stable; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, flake-utils, uiua }: + outputs = { self, nixpkgs, flake-utils, uiua, nickel }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; in { packages = { - default = uiua.packages.${system}.default; - #default = nickel.packages.${system}.default; + uiua = uiua.packages.${system}.default; + nickel = nickel.packages.${system}.default; }; hydraJobs = { inherit (self) packages; From ad1088fe60c6ac0b0366c19c7c924f22de1581dc Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:39:56 +0100 Subject: [PATCH 13/15] yes --- flake.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 641936e..ff73b79 100644 --- a/flake.nix +++ b/flake.nix @@ -7,18 +7,19 @@ url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; }; - nickel = { - url = github:tweag/nickel/stable; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #nickel = { + # url = github:tweag/nickel/stable; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; - outputs = { self, nixpkgs, flake-utils, uiua, nickel }: + outputs = { self, nixpkgs, flake-utils, uiua#, nickel + }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; in { packages = { - uiua = uiua.packages.${system}.default; - nickel = nickel.packages.${system}.default; + default = uiua.packages.${system}.default; + #nickel = nickel.packages.${system}.default; }; hydraJobs = { inherit (self) packages; From e0de7b4ba32f9239bc9df8084a005ed45aa1b97e Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 03:40:16 +0100 Subject: [PATCH 14/15] lock as well --- flake.lock | 630 +---------------------------------------------------- 1 file changed, 8 insertions(+), 622 deletions(-) diff --git a/flake.lock b/flake.lock index de31fda..b43d90f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,14 @@ { "nodes": { - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1688825073, - "narHash": "sha256-fK2huTDGHJc/oZjZWhMZMAt1nQSuuY6p41Y2pudtJdM=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "5ceeefcbbabf4b510ef8ede121d6dc57d1a1f7f8", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": [ + "uiua", + "flake-utils" + ], "nixpkgs": [ - "nickel", + "uiua", "nixpkgs" ], "rust-overlay": "rust-overlay" @@ -40,58 +27,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nickel", - "topiary", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": [ - "uiua", - "flake-utils" - ], - "nixpkgs": [ - "uiua", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_5" - }, - "locked": { - "lastModified": 1695511445, - "narHash": "sha256-mnE14re43v3/Jc50Jv0BKPMtEk7FEtDSligP6B5HwlI=", - "owner": "ipetkov", - "repo": "crane", - "rev": "3de322e06fc88ada5e3589dc8a375b73e749f512", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -108,70 +43,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -208,262 +79,7 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nickel", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nickel": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_3", - "nix-input": "nix-input", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay_2", - "topiary": "topiary" - }, - "locked": { - "lastModified": 1700157516, - "narHash": "sha256-j4Tnhef9C+cXQb82bazpYbI4lNE+aTXcb6FrKkcn76o=", - "owner": "tweag", - "repo": "nickel", - "rev": "063d77e46b11c26103d34971071271efc702ed73", - "type": "github" - }, - "original": { - "owner": "tweag", - "ref": "stable", - "repo": "nickel", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-input": { - "inputs": { - "flake-compat": "flake-compat_2", - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1694598107, - "narHash": "sha256-JEJSU2O+getWkc+Ql6Dsp72ZGihyZ2Ba7fMdv+ma4TQ=", - "owner": "nixos", - "repo": "nix", - "rev": "b99fdcf8dbb38ec0be0e82f65d1d138ec9e89dda", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1681358109, - "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1703013332, "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", @@ -479,143 +95,14 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": [ - "nickel", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nickel", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nickel": "nickel", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "uiua": "uiua" } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "nickel", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "nickel", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695003086, - "narHash": "sha256-d1/ZKuBRpxifmUf7FaedCqhy0lyVbqj44Oc2s+P5bdA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b87a14abea512d956f0b89d0d8a1e9b41f3e20ff", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "nickel", - "flake-utils" - ], - "nixpkgs": [ - "nickel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696039808, - "narHash": "sha256-7TbAr9LskWG6ISPhUdyp6zHboT7FsFrME5QsWKybPTA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a4c3c904ab29e04a20d3a6da6626d66030385773", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "flake-utils": [ - "nickel", - "topiary", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "nickel", - "topiary", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688351637, - "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1689042658, - "narHash": "sha256-p7cQAFNt5kX19sZvK74CmY0nTrtujpZg6sZUiV1ntAk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d7181bb2237035df17cab9295c95f987f5c527e6", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_5": { "inputs": { "flake-utils": [ "uiua", @@ -672,111 +159,10 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "topiary": { - "inputs": { - "advisory-db": "advisory-db", - "crane": "crane_2", - "flake-utils": "flake-utils_5", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nickel", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_4" - }, - "locked": { - "lastModified": 1695289853, - "narHash": "sha256-EgDFjJeGJb36je/be7DXvzvpBYDUaupOiQxtL7bN/+Q=", - "owner": "tweag", - "repo": "topiary", - "rev": "8299a04bf83c4a2774cbbff7a036c022efa939b3", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "topiary", - "type": "github" - } - }, "uiua": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_7", + "crane": "crane", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] From c7d0d335dbdd207cb71f392dcf2c14889e5d96a7 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 04:23:50 +0100 Subject: [PATCH 15/15] idk --- flake.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 69c52c2..815ddca 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,21 @@ { description = "A few hydra jobs"; inputs = { -#nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11; nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; - flake-utils.url = github:numtide/flake-utils; uiua = { url = github:uiua-lang/uiua?ref=0.7.1; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, flake-utils, nixpkgs, uiua }: + outputs = { self, nixpkgs, uiua }: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - packages = { - default = uiua.packages.${system}.default; + pkgs = nixpkgs.legacyPackages.${system}; + in { + packages = { + uiua = uiua.packages.${system}.default; + }; + hydraJobs = { + inherit (self) packages; + }; }; - hydraJobs = { - inherit (self) packages; - }; - }; }