diff --git a/dev/flake.lock b/dev/flake.lock index 3379c4b..56456da 100644 --- a/dev/flake.lock +++ b/dev/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1739595404, + "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "06519cec8fb32d219006da6eacd255504a9996af", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -92,29 +92,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1725232686, - "narHash": "sha256-ySkhjS2Px3+NuWfTo317et7/uy1IC2qH9Ou5Toxudv4=", + "lastModified": 1740872034, + "narHash": "sha256-GpLm/aCmymphq/mrWI8bnsEtC+xFyMjthnWMDQhiHE8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "43e0b0d1bed337243512a4f018226e4309002203", + "rev": "3996a40a27b07cbc6c9019c3c497ad919388f795", "type": "github" }, "original": { @@ -129,15 +113,14 @@ "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1740870877, + "narHash": "sha256-LWDIJvKWMW0tiih1jTcAK0ncTi3S9IF3gOhpCT1ydik=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "25d4946dfc2021584f5bde1fbd2aa97353384a95", "type": "github" }, "original": { diff --git a/extras/partitions.nix b/extras/partitions.nix index c980b4a..664532f 100644 --- a/extras/partitions.nix +++ b/extras/partitions.nix @@ -83,13 +83,12 @@ let # Nix does not recognize that a flake like "${./dev}", which is a content # addressed store path is a pure input, so we have to fetch and wire it - # manually with get-flake. - # TODO: update this - get-flake = import (builtins.fetchTree { - type = "github"; - owner = "ursi"; - repo = "get-flake"; - rev = "a6c57417d1b857b8be53aba4095869a0f438c502"; + # manually with flake-compat. + get-flake = src: (flake-compat { inherit src; system = throw "operating flake-compat in pure mode; system not allowed to be used"; }).outputs; + # TODO: update + flake-compat = import (builtins.fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/9ed2ac151eada2306ca8c418ebd97807bb08f6ac.tar.gz"; + sha256 = "sha256:063slk1np1g1dkh21a82x655kpja7p4pc74rb3lqankyrbbpy4hx"; }); in diff --git a/flake.lock b/flake.lock index ef5f9de..eccb114 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,14 @@ "nodes": { "nixpkgs-lib": { "locked": { - "lastModified": 1726155622, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "356624c12086a18f2ea2825fed34523d60ccc4e3", - "type": "github" + "lastModified": 1740872140, + "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, "root": { diff --git a/modules/flake.nix b/modules/flake.nix index 012a6c9..7792529 100644 --- a/modules/flake.nix +++ b/modules/flake.nix @@ -10,7 +10,23 @@ in flake = mkOption { type = types.submoduleWith { modules = [ - { freeformType = types.lazyAttrsOf types.raw; } + { + freeformType = + types.lazyAttrsOf + (types.unique + { + message = '' + No option has been declared for this flake output attribute, so its definitions can't be merged automatically. + Possible solutions: + - Load a module that defines this flake output attribute + Many modules are listed at https://flake.parts + - Declare an option for this flake output attribute + - Make sure the output attribute is spelled correctly + - Define the value only once, with a single definition in a single module + ''; + } + types.raw); + } ]; }; description = ''