Merge pull request #35 from dfinity-lab/paulyoung/fix-nix-shell

Add top-level overlay, fix nix-shell

Author: mergify[bot]

nix/overlays/default.nix

@@ -10,4 +10,7 @@
   (import ./dfinity.nix)
   (import ./dfinity-sdk.nix)
   (import ./mkCiShell.nix)
+  # This file must be the last mentioned as it uses outputs from most other files
+  # and lifts them to the top-level package set
+  (import ./top-level.nix)
 ]

nix/overlays/dfinity-sdk.nix

@@ -2,15 +2,6 @@ self: super:
 
 let dfx = super.callPackage ../../dfx/package.nix {
   inherit (self) actorscript dfinity runCommand;
-
-  libressl = self.libressl_2_9;
-
-  # rustfmt needs to be compatible with rustc. The rust repo actually
-  # specifies the compatible rustfmt src using a git submodule.
-  # self.pkgsUnstable.rustfmt is a derivation for rustfmt based on that
-  # src. See: https://github.com/NixOS/nixpkgs/pull/66713
-  rustfmt = self.pkgsUnstable.rustfmt;
-  rls = self.pkgsUnstable.rls;
 }; in
 
 {

nix/overlays/top-level.nix

@@ -0,0 +1,16 @@
+# A nixpkgs overlay adding the top-level tools/packages
+self: super:
+rec {
+  rustc = self.rustPackages.rustc;
+  cargo = self.rustPackages.cargo;
+
+  # These are used by various targets
+  libressl = super.libressl_2_9;
+
+  # rustfmt needs to be compatible with rustc. The rust repo actually specifies
+  # the compatible rustfmt src using a git submodule.
+  # self.pkgsUnstable.rustfmt is a derivation for rustfmt based on that src.
+  # See: https://github.com/NixOS/nixpkgs/pull/66713
+  rustfmt = super.pkgsUnstable.rustfmt;
+  rls = super.pkgsUnstable.rls;
+}

nix/sources.json

@@ -40,8 +40,8 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "basvandijk",
         "repo": "nixpkgs",
-        "rev": "6938a95bd7da5fed8d32ee1b70177e0e2ee03647",
-        "sha256": "1nv9gr277vfl2hjsmwyibl3r3dr3v208cq54jyx8agyls3zdp0nq",
+        "rev": "37831d6d350d606194d4fbad8e29de48cdb4c426",
+        "sha256": "1a4m1rf5nrq9qs972svclylz9m2nn001klk1b3zr4mry706ph5qp",
         "type": "tarball",
         "url": "https://github.com/basvandijk/nixpkgs/archive/6938a95bd7da5fed8d32ee1b70177e0e2ee03647.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"