Merge pull request ngi-nix#2 from nix-how/mc/fix-inputs

flake: use upstream scion again
astro · Feb 22, 2022 · b148a53 · b148a53
2 parents fa6697a + 4ecc604
commit b148a53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,11 +5,7 @@
   inputs.nixpkgs = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
 
   # Upstream source tree(s).
-  #inputs.scion-src = { type = "github"; owner = "netsec-ethz"; repo = "scion"; ref = "scionlab"; flake = false; };
-
-  # scion are not commiting their go.mod/go.sum properly, so using our own fork
-  # for now.
-  inputs.scion-src = { url = "github:matthewcroughan/scion/scionlab"; flake = false; };
+  inputs.scion-src = { type = "github"; owner = "netsec-ethz"; repo = "scion"; ref = "scionlab"; flake = false; };
 
   inputs.scion-apps-src = { type = "github"; owner = "netsec-ethz"; repo = "scion-apps"; flake = false; };
   inputs.scionlab-src = { type = "github"; owner = "netsec-ethz"; repo = "scionlab"; ref = "develop"; flake = false; };