More nix fixes

ulrikstrid · Dec 16, 2024 · 00d1d2d · 00d1d2d
1 parent 43017e4
commit 00d1d2d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,6 @@
     nixpkgs.url = "github:nix-ocaml/nix-overlays";
 
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.inputs.flake-utils.follows = "flake-utils";
 
     nix-filter.url = "github:numtide/nix-filter";
   };
@@ -35,26 +34,28 @@
               drv.pname == null ||
               !(lib.any (name: name == drv.pname || name == drv.name) (lib.attrNames oidcDrvs)))
             inputs;
-        devShell = (pkgs.mkShell {
-          inputsFrom = lib.attrValues oidcDrvs;
-          buildInputs = with pkgs; with ocamlPackages; [
-            ocaml-lsp
-            ocamlformat
-            odoc
-            reenv
-            # dune-release
-            cacert
-            curl
-            which
-          ];
-        }).overrideAttrs (o: {
-          propagatedBuildInputs = filterDrvs o.propagatedBuildInputs;
-          buildInputs = filterDrvs o.buildInputs;
-          checkInputs = filterDrvs o.checkInputs;
-        });
+        devShells = {
+          default = (pkgs.mkShell {
+            inputsFrom = lib.attrValues oidcDrvs;
+            buildInputs = with pkgs; with ocamlPackages; [
+              ocaml-lsp
+              ocamlformat
+              odoc
+              reenv
+              # dune-release
+              cacert
+              curl
+              which
+            ];
+          }).overrideAttrs (o: {
+            propagatedBuildInputs = filterDrvs o.propagatedBuildInputs;
+            buildInputs = filterDrvs o.buildInputs;
+            checkInputs = filterDrvs o.checkInputs;
+          });
+        };
       in
       {
-        inherit devShell;
+        inherit devShells;
         packages = {
           oidc = oidcPkgs.oidc;
         };

diff --git a/nix/generic.nix b/nix/generic.nix
@@ -94,7 +94,6 @@ rec {
       routes
       uuidm
       oidc
-      oauth
       jose
       piaf
       uri
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,7 +94,6 @@ rec { @@
           routes
           uuidm
           oidc
-          oauth
           jose
           piaf
           uri
@@ Expand Down @@