From 5bcb10eff477c2cad099c90a06c369f503001b4b Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Thu, 16 May 2024 22:47:23 +0200
Subject: [PATCH] rename to dashed version

---
 default.nix    |  8 ++++++++
 flake.nix      | 10 +++++-----
 pkgs/hare.nix  | 18 +++++++++---------
 pkgs/harec.nix |  8 ++++----
 4 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 default.nix

diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..1d70575
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,8 @@
+let pkgs = import <nixpkgs> { }; in
+rec {
+  hare-as = pkgs.callPackage ./pkgs/hare-as.nix { };
+  hare-cc = pkgs.callPackage ./pkgs/hare-cc.nix { };
+  hare-ld = pkgs.callPackage ./pkgs/hare-ld.nix { };
+  harec = pkgs.callPackage ./pkgs/harec.nix { inherit hare-as hare-cc hare-ld; };
+  hare = pkgs.callPackage ./pkgs/hare.nix { inherit harec hare-as hare-cc hare-ld; };
+}
diff --git a/flake.nix b/flake.nix
index 07877c6..d6c0b05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,11 +10,11 @@
       devShells = forAllSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          hareAs = pkgs.callPackage ./pkgs/hare-as.nix { };
-          hareCc = pkgs.callPackage ./pkgs/hare-cc.nix { };
-          hareLd = pkgs.callPackage ./pkgs/hare-ld.nix { };
-          harec = pkgs.callPackage ./pkgs/harec.nix { inherit hareAs hareCc hareLd; };
-          hare = pkgs.callPackage ./pkgs/hare.nix { inherit harec hareAs hareCc hareLd; };
+          hare-as = pkgs.callPackage ./pkgs/hare-as.nix { };
+          hare-cc = pkgs.callPackage ./pkgs/hare-cc.nix { };
+          hare-ld = pkgs.callPackage ./pkgs/hare-ld.nix { };
+          harec = pkgs.callPackage ./pkgs/harec.nix { inherit hare-as hare-cc hare-ld; };
+          hare = pkgs.callPackage ./pkgs/hare.nix { inherit harec hare-as hare-cc hare-ld; };
         in
         {
           default = pkgs.mkShell {
diff --git a/pkgs/hare.nix b/pkgs/hare.nix
index 32e1c09..927f27e 100644
--- a/pkgs/hare.nix
+++ b/pkgs/hare.nix
@@ -8,9 +8,9 @@
   tzdata,
   python3,
   substituteAll,
-  hareAs,
-  hareCc,
-  hareLd,
+  hare-as,
+  hare-cc,
+  hare-ld,
 }:
 let
   arch = stdenv.hostPlatform.uname.processor;
@@ -56,9 +56,9 @@ stdenv.mkDerivation  (finalAttrs: {
     "ARCH=${arch}"
     "VERSION=${finalAttrs.version}-nixpkgs"
     "QBEFLAGS=-t${qbePlatform}"
-    "CC=${hareCc}/bin/hare-cc"
-    "AS=${hareAs}/bin/hare-as"
-    "LD=${hareLd}/bin/hare-ld"
+    "CC=${hare-cc}/bin/hare-cc"
+    "AS=${hare-as}/bin/hare-as"
+    "LD=${hare-ld}/bin/hare-ld"
     # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
     # not follow the FHS.
     "HAREPATH=$(SRCDIR)/hare/stdlib"
@@ -74,9 +74,9 @@ stdenv.mkDerivation  (finalAttrs: {
   postFixup = ''
     wrapProgram $out/bin/hare \
       --prefix PATH : ${lib.makeBinPath [harec qbe]} \
-      --set CC ${hareCc}/bin/hare-cc \
-      --set AS ${hareAs}/bin/hare-as \
-      --set LD ${hareLd}/bin/hare-ld
+      --set CC ${hare-cc}/bin/hare-cc \
+      --set AS ${hare-as}/bin/hare-as \
+      --set LD ${hare-ld}/bin/hare-ld
 
     wrapProgram $out/bin/haredoc \
       --prefix PATH : ${lib.makeBinPath [scdoc]}
diff --git a/pkgs/harec.nix b/pkgs/harec.nix
index 1fba1b6..62af45f 100644
--- a/pkgs/harec.nix
+++ b/pkgs/harec.nix
@@ -1,4 +1,4 @@
-{ stdenv, qbe, hareAs, hareCc, hareLd }:
+{ stdenv, qbe, hare-as, hare-cc, hare-ld }:
 let
   arch = stdenv.hostPlatform.uname.processor;
   qbePlatform = {
@@ -23,9 +23,9 @@ stdenv.mkDerivation  (finalAttrs: {
     "ARCH=${arch}"
     "VERSION=${finalAttrs.version}-nixpkgs"
     "QBEFLAGS=-t${qbePlatform}"
-    "CC=${hareCc}/bin/hare-cc"
-    "AS=${hareAs}/bin/hare-as"
-    "LD=${hareLd}/bin/hare-ld"
+    "CC=${hare-cc}/bin/hare-cc"
+    "AS=${hare-as}/bin/hare-as"
+    "LD=${hare-ld}/bin/hare-ld"
   ];
 
   postConfigure = ''