Cleanup inputs

This commit is contained in:
Sandro - 2022-12-17 20:07:45 +01:00
parent 8ea43cc31d
commit d6a994598b
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 25 additions and 107 deletions

View File

@ -25,11 +25,15 @@
}, },
"alert2muc": { "alert2muc": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": [
"naersk"
],
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
], ],
"utils": "utils" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1671235085, "lastModified": 1671235085,
@ -47,7 +51,9 @@
}, },
"bevy-julia": { "bevy-julia": {
"inputs": { "inputs": {
"naersk": "naersk_2", "naersk": [
"naersk"
],
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
], ],
@ -273,46 +279,6 @@
} }
}, },
"naersk": { "naersk": {
"inputs": {
"nixpkgs": [
"alert2muc",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671096816,
"narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
"owner": "nix-community",
"repo": "naersk",
"rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"naersk_2": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1662220400,
"narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
"owner": "nix-community",
"repo": "naersk",
"rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"naersk_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
@ -332,28 +298,6 @@
"type": "github" "type": "github"
} }
}, },
"naersk_4": {
"inputs": {
"nixpkgs": [
"ticker",
"nixpkgs"
]
},
"locked": {
"lastModified": 1659610603,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"owner": "nix-community",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github"
}
},
"newNixpkgs": { "newNixpkgs": {
"locked": { "locked": {
"lastModified": 1647380550, "lastModified": 1647380550,
@ -373,7 +317,7 @@
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
@ -472,15 +416,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1663264531, "lastModified": 1645296114,
"narHash": "sha256-2ncO5chPXlTxaebDlhx7MhL0gOEIWxzSyfsl0r0hxQk=", "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "454887a35de6317a30be284e8adc2d2f6d8a07c4", "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-21.05-small",
"type": "indirect" "type": "indirect"
} }
}, },
@ -499,21 +444,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1645296114,
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-21.05-small",
"type": "indirect"
}
},
"oparl-scraper": { "oparl-scraper": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -581,7 +511,7 @@
"heliwatch": "heliwatch", "heliwatch": "heliwatch",
"hydra-ca": "hydra-ca", "hydra-ca": "hydra-ca",
"microvm": "microvm", "microvm": "microvm",
"naersk": "naersk_3", "naersk": "naersk",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-mobilizon": "nixos-mobilizon", "nixos-mobilizon": "nixos-mobilizon",
@ -777,7 +707,9 @@
"fenix": [ "fenix": [
"fenix" "fenix"
], ],
"naersk": "naersk_4", "naersk": [
"naersk"
],
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
], ],
@ -841,21 +773,6 @@
"url": "https://gitea.c3d2.de/astro/tracer" "url": "https://gitea.c3d2.de/astro/tracer"
} }
}, },
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"yammat": { "yammat": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@ -18,7 +18,11 @@
}; };
alert2muc = { alert2muc = {
url = "git+https://gitea.c3d2.de/astro/alert2muc"; url = "git+https://gitea.c3d2.de/astro/alert2muc";
inputs.nixpkgs.follows = "nixos"; inputs = {
naersk.follows = "naersk";
nixpkgs.follows = "nixos";
utils.follows = "flake-utils";
};
}; };
bevy-mandelbrot = { bevy-mandelbrot = {
# url = "github:matelab/bevy_mandelbrot"; # url = "github:matelab/bevy_mandelbrot";
@ -34,9 +38,7 @@
url = "git+https://gitea.c3d2.de/astro/bevy-julia.git?ref=main"; url = "git+https://gitea.c3d2.de/astro/bevy-julia.git?ref=main";
inputs = { inputs = {
nixpkgs.follows = "nixos"; nixpkgs.follows = "nixos";
# breaks the build: naersk.follows = "naersk";
# naersk.follows = "naersk";
# naersk.inputs.nixpkgs.follows = "nixpkgs";
rust-overlay.follows = "rust-overlay"; rust-overlay.follows = "rust-overlay";
}; };
}; };
@ -145,8 +147,7 @@
url = "git+https://gitea.c3d2.de/astro/ticker.git"; url = "git+https://gitea.c3d2.de/astro/ticker.git";
inputs = { inputs = {
fenix.follows = "fenix"; fenix.follows = "fenix";
# TODO: build regression in https://github.com/nix-community/naersk/commit/6944160c19cb591eb85bbf9b2f2768a935623ed3 naersk.follows = "naersk";
# naersk.follows = "naersk";
nixpkgs.follows = "nixos"; nixpkgs.follows = "nixos";
utils.follows = "flake-utils"; utils.follows = "flake-utils";
}; };