Remove require from lock

Author: adisbladis

go/gobuild-nix-generate/main.go

@@ -38,7 +38,6 @@ type lockFile struct {
 	Schema  int                       `toml:"schema"`
 	Cycles  map[string]int            `toml:"cycles,omitempty"`
 	Locked  map[string]*goPackageLock `toml:"locked"`
-	Require []string                  `toml:"require"`
 }
 
 //go:embed fetcher.nix
@@ -132,19 +131,8 @@ func createLock(directory string, workers int, pkgsFlag string, attrFlag string)
 		}
 	}
 
-	log.Println("Downloading initial dependencies")
-	modDownloads, err := downloadModules(directory, []string{})
-	if err != nil {
-		return nil, err
-	}
-	for _, download := range modDownloads {
-		lock.Require = append(lock.Require, download.Path)
-	}
-
-	log.Println("Done downloading initial dependencies")
-
 	log.Println("Discovering dependencies")
-	modDownloads, err = discoverDependencies(directory, workers, sumVersions)
+	modDownloads, err := discoverDependencies(directory, workers, sumVersions)
 	if err != nil {
 		return nil, err
 	}

lib.nix

@@ -62,7 +62,7 @@ in
                       let
                         locked = lockFile.locked.${goPackagePath};
                       in
-                      concatMap (req: if elem req cycle then [ ] else if ! final ? ${req} then (builtins.trace req [ ]) else [ final.${req} ]) (locked.require or [ ])
+                      concatMap (req: if elem req cycle then [ ] else [ final.${req} ]) (locked.require or [ ])
                     ) cycle;
 
                   }
@@ -79,8 +79,6 @@ in
         in
         {
           inherit cycles;
-
-          require = map (packagePath: final.${packagePath}) lockFile.require;
         }
         // mapAttrs (
           goPackagePath: locked:

nix/default.nix

@@ -1,3 +1,21 @@
+let
+  wellKnown = builtins.listToAttrs (
+    map
+      (name: {
+        inherit name;
+        value = null;
+      })
+      [
+        "go"
+        "require"
+        "goPackages"
+        "gobuild-nix-gocacheprog"
+        "fetchers"
+        "hooks"
+        "callPackage"
+      ]
+  );
+in
 {
   go,
   newScope,
@@ -12,8 +30,17 @@ lib.makeScope newScope (
     # Tooling
     inherit go;
 
-    # Empty initial list of require's until overriden by generated overlay
-    require = [ ];
+    # List all non-known attributes in the require list
+    require = builtins.concatMap (
+      attr:
+      if wellKnown ? ${attr} then
+        [ ]
+      else
+        let
+          value = final.${attr};
+        in
+        if !lib.isDerivation value then [ ] else [ value ]
+    ) (builtins.attrNames final);
 
     goPackages = final;