racket-catalog/ansi-color/default.nix

@@ -22,7 +22,7 @@
     description = "A library to make it easy to write colorized and styled output in terminals that support ANSI escape codes (most command lines).";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."LGPL-3.0-or-later")];
+    license = ((lib).licenses).lgpl3Plus;
     homepage = "https://github.com/renatoathaydes/ansi-color/tree/HEAD/README.md";
   };
 })

racket-catalog/br-parser-tools-lib/default.nix

@@ -21,6 +21,6 @@
     description = "fork of `parser-tools-lib` for Beautiful Racket";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."LGPL-3.0-or-later")];
+    license = [(((lib).licenses).lgpl3Plus)];
   };
 })

racket-catalog/brag-lib/default.nix

@@ -22,6 +22,6 @@
     description = "";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).mit)];
   };
 })

racket-catalog/cldr-bcp47/default.nix

@@ -23,6 +23,6 @@
     description = "API for BCP47 extensions to CLDR";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT") (((lib).licensesSpdx)."Unicode-TOU")];
+    license = [(((lib).licenses).mit) (((lib).licenses).unicodeTOU)];
   };
 })

racket-catalog/cldr-core/default.nix

@@ -23,6 +23,6 @@
     description = "API for cldr-core data set";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT") (((lib).licensesSpdx)."Unicode-TOU")];
+    license = [(((lib).licenses).mit) (((lib).licenses).unicodeTOU)];
   };
 })

racket-catalog/cldr-dates-modern/default.nix

@@ -23,6 +23,6 @@
     description = "API for cldr-dates-modern data set";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT") (((lib).licensesSpdx)."Unicode-TOU")];
+    license = [(((lib).licenses).mit) (((lib).licenses).unicodeTOU)];
   };
 })

racket-catalog/cldr-localenames-modern/default.nix

@@ -23,6 +23,6 @@
     description = "API for cldr-localenames-modern data set";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT") (((lib).licensesSpdx)."Unicode-TOU")];
+    license = [(((lib).licenses).mit) (((lib).licenses).unicodeTOU)];
   };
 })

racket-catalog/cldr-numbers-modern/default.nix

@@ -23,6 +23,6 @@
     description = "API for cldr-numbers-modern data set";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT") (((lib).licensesSpdx)."Unicode-TOU")];
+    license = [(((lib).licenses).mit) (((lib).licenses).unicodeTOU)];
   };
 })

racket-catalog/fancy-app/default.nix

@@ -22,6 +22,6 @@
     description = "Scala-style anonymous functions";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).mit)];
   };
 })

racket-catalog/fmt/default.nix

@@ -23,7 +23,7 @@
     description = "An extensible code formatter for Racket";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."Apache-2.0") (((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).asl20) (((lib).licenses).mit)];
     homepage = "https://github.com/sorawee/fmt/tree/HEAD/README.md";
   };
 })

racket-catalog/gregor-lib/default.nix

@@ -29,7 +29,7 @@
     description = "Code part of the gregor date and time library";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).mit)];
     homepage = "https://github.com/97jaz/gregor/tree/HEAD/README.md";
   };
 })

racket-catalog/guard/default.nix

@@ -22,7 +22,7 @@
     description = "Macros similar to Swift's \"guard statements\".";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."Apache-2.0") (((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).asl20) (((lib).licenses).mit)];
     homepage = "https://github.com/jackfirth/guard/tree/HEAD/README.md";
   };
 })

racket-catalog/memoize-lib/default.nix

@@ -22,7 +22,7 @@
     description = "core library for memoize";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).mit)];
     homepage = "https://github.com/jbclements/memoize/tree/master/README.md";
   };
 })

racket-catalog/north/default.nix

@@ -23,7 +23,7 @@
     description = "A database migration tool.";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."BSD-3-Clause")];
+    license = [(((lib).licenses).bsd3)];
     homepage = "https://github.com/Bogdanp/racket-north/tree/HEAD/README.md";
   };
 })

racket-catalog/pretty-expressive/default.nix

@@ -22,7 +22,7 @@
     description = "A pretty expressive printer";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."Apache-2.0") (((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).asl20) (((lib).licenses).mit)];
     homepage = "https://github.com/sorawee/pretty-expressive/tree/main/README.md";
   };
 })

racket-catalog/rebellion/default.nix

@@ -23,7 +23,7 @@
     description = "A collection of infrastructure libraries";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."Apache-2.0")];
+    license = [(((lib).licenses).asl20)];
     homepage = "https://github.com/jackfirth/rebellion/tree/HEAD/README.md";
   };
 })

racket-catalog/resyntax/default.nix

@@ -28,7 +28,7 @@
     description = "A refactoring tool built on top of syntax-parse.";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."Apache-2.0")];
+    license = [(((lib).licenses).asl20)];
     homepage = "https://github.com/jackfirth/resyntax/tree/HEAD/README.md";
     mainProgram = "resyntax";
   };

racket-catalog/tzinfo/default.nix

@@ -23,7 +23,7 @@
     description = "API for querying the IANA tz database";
     sourceProvenance = [(((lib).sourceTypes).fromSource)];
     broken = false;
-    license = [(((lib).licensesSpdx)."MIT")];
+    license = [(((lib).licenses).mit)];
     homepage = "https://github.com/97jaz/tzinfo/tree/HEAD/README.md";
   };
 })

racket2nix.rkt

@@ -49,6 +49,13 @@
 (define-runtime-path overrides-path "racket-catalog-overrides.rktd")
 (define catalog-overrides (file->value overrides-path))
 
+(define *license-mapping*
+  (hash
+    'BSD-3-Clause '(dot (dot lib licenses) bsd3)
+    'MIT '(dot (dot lib licenses) mit)
+    'Apache-2.0 '(dot (dot lib licenses) asl20)
+    'LGPL-3.0-or-later '(dot (dot lib licenses) lgpl3Plus)
+    'Unicode-TOU '(dot (dot lib licenses) unicodeTOU)))
 
 (define (racket-license->nix-license license)
   (if license
@@ -58,11 +65,13 @@
       (displayln "WARNING: no license for package -- using unfree")
       '(dot (dot lib licenses) unfree))))
 
-
 (define (cvtl lic-expr)
   (match lic-expr
     [(? symbol? _)
-     (list `(dot (dot lib licensesSpdx) ,(symbol->string lic-expr)))]
+     (list
+       (or
+         (hash-ref *license-mapping* lic-expr #f)
+         (error "no license mapping defined for" lic-expr)))]
     [`(,a OR ,b)
       (append (cvtl a) (cvtl b))]
     [`(,a AND ,b)
@@ -151,7 +160,7 @@
 
 (define (extract-free-vars expr [scope (set)])
   (match expr
-    [`(dot ,a ,(or (? symbol? b) (? string? b)))
+    [`(dot ,a ,(? symbol? b))
       (extract-free-vars a)]
     [`(app ,fun ,arg)
       (append (extract-free-vars fun scope)
@@ -234,40 +243,31 @@
       (write-string "}")])
   (void))
 
+(struct nix-repl [proc stdout stdin])
 
-(define (call-with-subprocess-env thk)
+(define current-nix-repl (make-parameter #f))
+
+(define (with-nix-repl thk)
   (parameterize ([current-subprocess-custodian-mode 'kill]
                  [current-environment-variables
                    (environment-variables-copy (current-environment-variables))])
     (putenv "TERM" "dumb")
     (putenv "NO_COLOR" "1")
     (call-with-custodian-shutdown
-      thk)))
+      (lambda ()
-
+        (define-values (proc stdout stdin stderr)
-(define (subprocess/path/piped . args)
+          (subprocess
-  (define-values [proc stdout stdin stderr]
+            #f #f 'stdout
-    (apply subprocess #f #f 'stdout "/usr/bin/env" args))
+            "/usr/bin/env"
-  (values proc stdout stdin))
+            "nix"
-
+            "--extra-experimental-features"
-
+            "nix-command flakes pipe-operator repl-automation"
-(struct nix-repl [proc stdout stdin])
+            "repl" "--impure" "."))
-(define current-nix-repl (make-parameter #f))
-
-
-(define (call-with-nix-repl thk)
-  (call-with-subprocess-env
-    (lambda ()
-      (define-values [proc stdout stdin]
-        (subprocess/path/piped
-          "nix"
-          "--extra-experimental-features"
-          "nix-command flakes pipe-operator repl-automation"
-          "repl" "--impure" "."))
 
         (sync (regexp-match-evt #px"^[^\x05]+\x05" stdout))
 
         (parameterize ([current-nix-repl (nix-repl proc stdout stdin)])
-          (thk)))))
+          (thk))))))
 
 (define (nix-eval line)
   (match-define (nix-repl _ stdout stdin) (current-nix-repl))
@@ -284,33 +284,46 @@
 (define (nix-format file*)
   (displayln "formatting generated nix")
   (define file (path->string file*))
-  (call-with-subprocess-env
+  (parameterize ([current-subprocess-custodian-mode 'kill]
-    (lambda ()
+                 [current-environment-variables
-      (define-values [proc stdout stdin]
+                   (environment-variables-copy (current-environment-variables))])
-        (subprocess/path/piped
+    (putenv "TERM" "dumb")
-          "alejandra" "--quiet" file))
+    (putenv "NO_COLOR" "1")
-      (port->string stdout)
+    (call-with-custodian-shutdown
-      (subprocess-wait proc)))
+      (lambda ()
-  (void))
+        (define-values (proc stdout stdin stderr)
-
+          (subprocess
+            #f #f 'stdout
+            "/usr/bin/env"
+            "alejandra"
+            "--quiet"
+            file))
+        (port->string stdout)
+        (subprocess-wait proc)))
+    (void)))
 
 (define (add-to-git-maybe file*)
   (define file (path->string file*))
-  (call-with-subprocess-env
+  (parameterize ([current-subprocess-custodian-mode 'kill])
-    (lambda ()
+    (call-with-custodian-shutdown
-      (define-values (proc stdout stdin)
+      (lambda ()
-        (subprocess/path/piped
+        (define-values (proc stdout stdin stderr)
-          "git" "rev-parse" "--show-toplevel"))
+          (subprocess
-      (port->string stdout)
+            #f #f 'stdout
-      (subprocess-wait proc)
+            "/usr/bin/env"
-
+            "git"
-      (when (= 0 (subprocess-status proc))
+            "rev-parse"
-        (define-values [proc stdout stdin]
+            "--show-toplevel"))
-          (subprocess/path/piped
-            "git" "add" file))
         (port->string stdout)
-        (subprocess-wait proc)))))
+        (subprocess-wait proc)
-
+        (when (= 0 (subprocess-status proc))
+          (define-values (proc stdout stdin stderr)
+            (subprocess
+              #f #f 'stdout
+              "/usr/bin/env"
+              "git" "add" file))
+          (port->string stdout)
+          (subprocess-wait proc))))))
 
 (define (racket2nix
           pkg-name
@@ -414,7 +427,8 @@
           ,@(if readme `((homepage ,readme)) '())
           ,@(if (and racket-launchers (not (empty? racket-launchers)))
                 `((mainProgram ,(first racket-launchers)))
-                '())))
+                '())
+           ))
 
       (define nix-passthru
         `(attrs
@@ -453,38 +467,20 @@
 
     (displayln "fetching source")
 
-    (call-with-nix-repl
+    (with-nix-repl
       (lambda ()
-        (define drv-def-out
+        (define drv-def-out (nix-eval
-          (nix-eval
+          (format "drv = with legacyPackages.${builtins.currentSystem}; instrumentedFetch (racketPackages.~a.src)" pkg-name)))
-            (format "drv = with legacyPackages.${builtins.currentSystem}; instrumentedFetch (racketPackages.~a.src)" pkg-name)))
+        (nix-eval ":b drv")
-
-        (unless (equal? drv-def-out "Added drv.")
-          (error "failed to eval package def" drv-def-out))
-
-        (define build-output (nix-eval ":b drv"))
         (define build-log (nix-eval ":log drv"))
-        (define real-hash
+        (match-define (list _ real-hash)
-          (match build-log
+          (regexp-match #px"FETCH_HASH:([^:]+):FETCH_HASH" build-log))
-            [(pregexp #px"FETCH_HASH:([^:]+):FETCH_HASH" (list _ real-hash))
-             real-hash]
-            [_ (error "failed to retrieve src hash" build-output build-log)]))
-
         (define subpath (generate-spec real-hash))
-
         (nix-eval ":r")
-        (define drv-def-out-r
+        (nix-eval
-          (nix-eval
+          (format "drv = with legacyPackages.${builtins.currentSystem}; instrumentedFetch (racketPackages.~a.src)" pkg-name))
-            (format "drv = with legacyPackages.${builtins.currentSystem}; instrumentedFetch (racketPackages.~a.src)" pkg-name)))
-
-        (unless (equal? drv-def-out-r "Added drv.")
-          (error "failed to eval package def" drv-def-out-r))
-
         (define out-path (nix-eval ":p drv.outPath"))
-        (define build-log-2 (nix-eval ":b drv"))
+        (nix-eval ":b drv")
-
-        (unless (directory-exists? out-path)
-          (error "failed to fetch source" out-path build-log-2))
 
         (define info-proc (get-info/full (build-path out-path subpath)))
 
@@ -495,23 +491,13 @@
           (and raco-commands*
                (map first raco-commands*)))
 
+        ; generate final nix file
         (generate-spec real-hash version racket-launchers raco-commands #t)
 
         (displayln "doing final module build")
         (nix-eval ":r")
-        (define drv-def-out-final
+        (nix-eval
-          (nix-eval
+          (format ":b with legacyPackages.${builtins.currentSystem}; racketPackages.~a" pkg-name))))
-            (format "drv = with legacyPackages.${builtins.currentSystem}; racketPackages.~a" pkg-name)))
-        (unless (equal? drv-def-out-final "Added drv.")
-          (error "failed to eval package def" drv-def-out-final))
-        (define out-path-final (nix-eval ":p drv.outPath"))
-        (define build-output-final
-          (nix-eval ":b drv"))
-
-        (unless (directory-exists? out-path-final)
-          (error "failed to do final build" out-path-final build-output-final))
-
-        (void)))
 
     (hash-set! acc pkg-name 'installed)