diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index fb2bdf0..0433972 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -3,7 +3,7 @@ nixpkgs.url = "github:nixos/nixpkgs/release-23.05"; sile-flake.url = "github:sile-typesetter/sile"; durnitisp-flake.url = "github:zaphar/durnitisp"; - runwhen-flake.url = "github:zaphar/runwhen"; + runwhen-flake.url = "github:zaphar/runwhen/v0.0.8"; agenix-flake.url = "github:ryantm/agenix"; rust-overlay-flake = { url = "github:oxalica/rust-overlay"; diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock index 6854c93..6005c94 100644 --- a/nix/darwin/flake.lock +++ b/nix/darwin/flake.lock @@ -34,12 +34,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-slV/Wip7cNLLNJXA/u25+h1l7ePi+1+/0T+GfgO+JA4=", - "path": "/nix/store/vqf2xx1r7is6hiy0m3pazs6cin0yhiqr-source/nix/base-system", + "narHash": "sha256-vXgdAGgsSloY711Gj/dyarLLnQLNMbW15OR6V/XWC9c=", + "path": "/nix/store/sp8xifa5sy2ypv0zfs63crz4kjlha82q-source/nix/base-system", "type": "path" }, "original": { - "path": "/nix/store/vqf2xx1r7is6hiy0m3pazs6cin0yhiqr-source/nix/base-system", + "path": "/nix/store/sp8xifa5sy2ypv0zfs63crz4kjlha82q-source/nix/base-system", "type": "path" } }, @@ -68,7 +68,7 @@ }, "darwin_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1687691275, @@ -201,21 +201,6 @@ } }, "flake-utils_4": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { "inputs": { "systems": "systems_2" }, @@ -233,7 +218,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_3" }, @@ -426,21 +411,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1650222748, - "narHash": "sha256-AHh/goEfG5hlhIMVgGQwACbuv5Wit2ND9vrcB4QthJs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ba88a5afa6fff7710c17b5423ff9d721386c4164", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1682109806, "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", @@ -456,7 +426,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -469,7 +439,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1689326639, "narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=", @@ -489,27 +459,26 @@ "inputs": { "base-system": "base-system", "darwin": "darwin_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" } }, "runwhen-flake": { "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_5", - "rust-overlay": "rust-overlay_2" + "naersk": "naersk_2" }, "locked": { - "lastModified": 1692062428, - "narHash": "sha256-0n/BRDjMP/iRPghtAJ07ah+dySnpXcxMC2EygSJE+Ow=", + "lastModified": 1692313277, + "narHash": "sha256-UOa7z6x6N6rldV2pnrHKftz/BbAiHAXlMUGlEfUUfAQ=", "owner": "zaphar", "repo": "runwhen", - "rev": "c5f339cd27284b426bb732ef9369813976d1392d", + "rev": "b69af94e5aa4b3e7a8ca92d0b372d60f8651bc12", "type": "github" }, "original": { "owner": "zaphar", + "ref": "v0.0.8", "repo": "runwhen", "type": "github" } @@ -543,7 +512,7 @@ }, "rust-overlay-flake": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "base-system", "nixpkgs" @@ -563,36 +532,13 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "base-system", - "runwhen-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1650162887, - "narHash": "sha256-e23LlN7NQGxrsSWNNAjyvrWlZ3kwFSav9kXbayibKWc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "26b570500cdd7a359526524e9abad341891122a6", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sile-flake": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "gitignore": "gitignore", "libtexpdf-src": "libtexpdf-src", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1687444516,