diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 01:35:06 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 02:11:48 +0200 |
| commit | 1a64deeb894dc95e2645a75771732c6cc53a79ad (patch) | |
| tree | 1b9df4838f894577a09b9b260151756272efeb53 /flakes/openarc | |
| parent | fa25ffd4583cc362075cd5e1b4130f33306103f0 (diff) | |
| download | Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.gz Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.zst Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.zip | |
Squash changes containing private information
There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
Diffstat (limited to 'flakes/openarc')
| -rw-r--r-- | flakes/openarc/flake.lock | 17 | ||||
| -rw-r--r-- | flakes/openarc/flake.nix | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/flakes/openarc/flake.lock b/flakes/openarc/flake.lock index e0b78a8..a9e5e81 100644 --- a/flakes/openarc/flake.lock +++ b/flakes/openarc/flake.lock | |||
| @@ -17,19 +17,14 @@ | |||
| 17 | }, | 17 | }, |
| 18 | "myuids": { | 18 | "myuids": { |
| 19 | "locked": { | 19 | "locked": { |
| 20 | "dir": "flakes/myuids", | 20 | "lastModified": 1, |
| 21 | "lastModified": 1628207001, | 21 | "narHash": "sha256-HkW9YCLQCNBX3Em7J7MjraVEZO3I3PizkVV2QrUdULQ=", |
| 22 | "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", | 22 | "path": "../myuids", |
| 23 | "ref": "master", | 23 | "type": "path" |
| 24 | "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", | ||
| 25 | "revCount": 865, | ||
| 26 | "type": "git", | ||
| 27 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" | ||
| 28 | }, | 24 | }, |
| 29 | "original": { | 25 | "original": { |
| 30 | "dir": "flakes/myuids", | 26 | "path": "../myuids", |
| 31 | "type": "git", | 27 | "type": "path" |
| 32 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" | ||
| 33 | } | 28 | } |
| 34 | }, | 29 | }, |
| 35 | "nixpkgs": { | 30 | "nixpkgs": { |
diff --git a/flakes/openarc/flake.nix b/flakes/openarc/flake.nix index 6fd45bf..17a3fdd 100644 --- a/flakes/openarc/flake.nix +++ b/flakes/openarc/flake.nix | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | description = "Open source ARC implementation"; | 2 | description = "Open source ARC implementation"; |
| 3 | 3 | ||
| 4 | inputs.myuids = { | 4 | inputs.myuids = { |
| 5 | url = "https://git.immae.eu/perso/Immae/Config/Nix.git"; | 5 | url = "path:../myuids"; |
| 6 | type = "git"; | ||
| 7 | dir = "flakes/myuids"; | ||
| 8 | }; | 6 | }; |
| 9 | inputs.flake-utils.url = "github:numtide/flake-utils"; | 7 | inputs.flake-utils.url = "github:numtide/flake-utils"; |
| 10 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; | 8 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; |
| @@ -66,6 +64,8 @@ | |||
| 66 | defaultSock = "/run/openarc/openarc.sock"; | 64 | defaultSock = "/run/openarc/openarc.sock"; |
| 67 | args = [ "-f" "-p" "local:${cfg.socket}" ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ]; | 65 | args = [ "-f" "-p" "local:${cfg.socket}" ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ]; |
| 68 | in { | 66 | in { |
| 67 | # Necessary for situations where flake gets included multiple times | ||
| 68 | key = builtins.hashString "sha256" (builtins.path { path = self.sourceInfo.outPath; name = "source"; }); | ||
| 69 | options = { | 69 | options = { |
| 70 | services.openarc = { | 70 | services.openarc = { |
| 71 | enable = lib.mkOption { | 71 | enable = lib.mkOption { |