From 9cb2d2bef6447d6a2121ed3e6e0f7a6f041e50a1 Mon Sep 17 00:00:00 2001 From: technofab Date: Mon, 15 Sep 2025 10:48:33 +0200 Subject: [PATCH] chore: move .nix -> nix, remove unused flake input --- flake.lock | 183 +------------------------------ flake.nix | 12 +- {.nix => nix}/repo/benchmark.nix | 0 {.nix => nix}/repo/devShells.nix | 0 {.nix => nix}/repo/docs.nix | 0 {.nix => nix}/repo/flake.lock | 0 {.nix => nix}/repo/flake.nix | 0 {.nix => nix}/repo/tests.nix | 0 8 files changed, 2 insertions(+), 193 deletions(-) rename {.nix => nix}/repo/benchmark.nix (100%) rename {.nix => nix}/repo/devShells.nix (100%) rename {.nix => nix}/repo/docs.nix (100%) rename {.nix => nix}/repo/flake.lock (100%) rename {.nix => nix}/repo/flake.nix (100%) rename {.nix => nix}/repo/tests.nix (100%) diff --git a/flake.lock b/flake.lock index 54fbce9..d988f28 100644 --- a/flake.lock +++ b/flake.lock @@ -1,63 +1,5 @@ { "nodes": { - "call-flake": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "haumea": { - "inputs": { - "nixpkgs": [ - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "incl": { - "inputs": { - "nixlib": [ - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1693483555, - "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", - "owner": "divnix", - "repo": "incl", - "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1754498491, @@ -89,49 +31,6 @@ "type": "github" } }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "paisano": { - "inputs": { - "call-flake": "call-flake", - "nixpkgs": [ - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1708640854, - "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=", - "owner": "paisano-nix", - "repo": "core", - "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.2.0", - "repo": "core", - "type": "github" - } - }, "ren": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -155,87 +54,7 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "ren": "ren", - "std": "std" - } - }, - "std": { - "inputs": { - "arion": [ - "std", - "blank" - ], - "blank": [], - "devshell": [ - "std", - "blank" - ], - "dmerge": [], - "haumea": "haumea", - "incl": "incl", - "lib": [ - "nixpkgs" - ], - "makes": [ - "std", - "blank" - ], - "microvm": [ - "std", - "blank" - ], - "n2c": [ - "std", - "blank" - ], - "nixago": [ - "std", - "blank" - ], - "nixpkgs": [ - "nixpkgs" - ], - "paisano": "paisano", - "paisano-tui": [], - "terranix": [ - "std", - "blank" - ], - "yants": "yants" - }, - "locked": { - "lastModified": 1747378812, - "narHash": "sha256-bx+Bt2tEpCkrY7ImaklaTQvH6VGrB7FAmnfs7tItYIs=", - "owner": "divnix", - "repo": "std", - "rev": "29f79b7ae7d1716ff13944b698fe76cb0675c5f6", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" + "ren": "ren" } } }, diff --git a/flake.nix b/flake.nix index 0fb00b5..7a32ee9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,16 +2,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; ren.url = "gitlab:rensa-nix/core?dir=lib"; - std = { - url = "github:divnix/std"; - inputs = { - nixpkgs.follows = "nixpkgs"; - lib.follows = "nixpkgs"; - paisano-tui.follows = ""; - dmerge.follows = ""; - blank.follows = ""; - }; - }; }; outputs = { @@ -22,7 +12,7 @@ ren.buildWith { inherit inputs; - cellsFrom = ./.nix; + cellsFrom = ./nix; transformInputs = system: i: i // { diff --git a/.nix/repo/benchmark.nix b/nix/repo/benchmark.nix similarity index 100% rename from .nix/repo/benchmark.nix rename to nix/repo/benchmark.nix diff --git a/.nix/repo/devShells.nix b/nix/repo/devShells.nix similarity index 100% rename from .nix/repo/devShells.nix rename to nix/repo/devShells.nix diff --git a/.nix/repo/docs.nix b/nix/repo/docs.nix similarity index 100% rename from .nix/repo/docs.nix rename to nix/repo/docs.nix diff --git a/.nix/repo/flake.lock b/nix/repo/flake.lock similarity index 100% rename from .nix/repo/flake.lock rename to nix/repo/flake.lock diff --git a/.nix/repo/flake.nix b/nix/repo/flake.nix similarity index 100% rename from .nix/repo/flake.nix rename to nix/repo/flake.nix diff --git a/.nix/repo/tests.nix b/nix/repo/tests.nix similarity index 100% rename from .nix/repo/tests.nix rename to nix/repo/tests.nix