org nix cosmetic

6 files changed, 17 insertions, 41 deletions

diff --git a/.gitattributes b/.gitattributes
index 71dd947..cdecd11 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@
 /subprojects export-ignore
 .gitattributes export-ignore
 tangle export-ignore
+flake.lock export-ignore
diff --git a/derivation.nix b/derivation.nix
index 3988e7c..04a3305 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -9,8 +9,7 @@ assert dcompiler != null;
 with (
   with lib;
   let
-    # filter function to remove the .dub package folder from src
-    filterDub = name: type: let baseName = baseNameOf (toString name); in ! (
+    filterDub = name: type: let baseName = baseNameOf (toString name); in ! ( # filter function to remove the .dub package folder from src
       type == "directory" && baseName == ".dub"
     );
     targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}";
@@ -73,8 +72,7 @@ with (
         description = package.description;
       } // attrs.meta or {};
     } // lib.optionalAttrs (!(attrs ? version)) {
-      # use name from dub.json, unless pname and version are specified
-      name = package.name;
+      name = package.name; # use name from dub.json, unless pname and version are specified
     }));
   }
 );
@@ -82,14 +80,8 @@ mkDubDerivation rec {
   pname         = "spine";
   version       = "0.11.3";
   src           = ./.;
-  nativeBuildInputs = with pkgs; [
-    dub
-    ldc
-  ];
-  buildInputs = with pkgs; [
-    nixVersions.unstable #nixFlakes
-    sqlite
-  ];
+  nativeBuildInputs = with pkgs; [ dub ldc ];
+  buildInputs = with pkgs; [ nixVersions.unstable sqlite ];
   meta = with pkgs.lib; {
     description = "A sisu like parser and document generator";
     longDescription = ''
diff --git a/flake.nix b/flake.nix
index 3fa66fa..075ce50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,12 +69,8 @@
           echo "built:"
           $out/bin/spine -v
         '';
-        nativeBuildInputs = with pkgs; [
-          ldc dub
-        ];
-        buildInputs = with pkgs; [
-          sqlite
-        ];
+        nativeBuildInputs = with pkgs; [ ldc dub ];
+        buildInputs = with pkgs; [ sqlite ];
      };
      packages.x86_64-linux.default = self.packages.x86_64-linux.spine;
   };
diff --git a/makefile b/makefile
index 77894c2..69d68d4 100644
--- a/makefile
+++ b/makefile
@@ -497,10 +497,11 @@ nixGitHEADtarballTar:
 
 # check test tarball
 nixGitHEADtarballCheck:
-	nix flake lock file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz; \
 	nix flake check file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz; \
 	nix flake show file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz;
 
+#	nix flake lock file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz; \
+
 # build test tarball
 nixGitHEADtarballBuild:
 	echo "nix build file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz#spine --print-build-logs"
diff --git a/org/config_nix.org b/org/config_nix.org
index 92576e0..4a637a4 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -561,12 +561,8 @@ postInstall:
           echo "built:"
           $out/bin/spine -v
         '';
-        nativeBuildInputs = with pkgs; [
-          ldc dub
-        ];
-        buildInputs = with pkgs; [
-          sqlite
-        ];
+        nativeBuildInputs = with pkgs; [ ldc dub ];
+        buildInputs = with pkgs; [ sqlite ];
      };
      packages.x86_64-linux.default = self.packages.x86_64-linux.spine;
   };
@@ -1024,8 +1020,7 @@ assert dcompiler != null;
 with (
   with lib;
   let
-    # filter function to remove the .dub package folder from src
-    filterDub = name: type: let baseName = baseNameOf (toString name); in ! (
+    filterDub = name: type: let baseName = baseNameOf (toString name); in ! ( # filter function to remove the .dub package folder from src
       type == "directory" && baseName == ".dub"
     );
     targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}";
@@ -1088,8 +1083,7 @@ with (
         description = package.description;
       } // attrs.meta or {};
     } // lib.optionalAttrs (!(attrs ? version)) {
-      # use name from dub.json, unless pname and version are specified
-      name = package.name;
+      name = package.name; # use name from dub.json, unless pname and version are specified
     }));
   }
 );
@@ -1097,14 +1091,8 @@ mkDubDerivation rec {
   pname         = "spine";
   version       = "<<spine_version_set>>";
   src           = ./.;
-  nativeBuildInputs = with pkgs; [
-    dub
-    ldc
-  ];
-  buildInputs = with pkgs; [
-    nixVersions.unstable #nixFlakes
-    sqlite
-  ];
+  nativeBuildInputs = with pkgs; [ dub ldc ];
+  buildInputs = with pkgs; [ nixVersions.unstable sqlite ];
   meta = with pkgs.lib; {
     description = "A sisu like parser and document generator";
     longDescription = ''
@@ -1564,8 +1552,7 @@ with (
         description = package.description;
       } // attrs.meta or {};
     } // lib.optionalAttrs (!(attrs ? version)) {
-      # Use name from dub.json, unless pname and version are specified
-      name = package.name;
+      name = package.name; # use name from dub.json, unless pname and version are specified
     }));
   }
 );
diff --git a/sundry/spine_search_cgi/derivation.nix b/sundry/spine_search_cgi/derivation.nix
index 6b1b6e6..a00865f 100644
--- a/sundry/spine_search_cgi/derivation.nix
+++ b/sundry/spine_search_cgi/derivation.nix
@@ -78,8 +78,7 @@ with (
         description = package.description;
       } // attrs.meta or {};
     } // lib.optionalAttrs (!(attrs ? version)) {
-      # Use name from dub.json, unless pname and version are specified
-      name = package.name;
+      name = package.name; # use name from dub.json, unless pname and version are specified
     }));
   }
 );