flake.nix ldc2-1.40.0-beta6 & removed flake-utilsHEADmain

5 files changed, 19 insertions, 53 deletions

diff --git a/README b/README
index 01cd446..14530e8 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ nix control files
   - flake.nix
 
 nix overlays for (updates nixpkgs, more recent versions of):
-  - ldc     ( 1.30.0 -> 1.40.0-beta5 )
+  - ldc     ( 1.30.0 -> 1.40.0-beta6 )
   - dub     ( 1.23.0 -> 1.38.1 ) [for nix versions 1.31.0 ... 1.33.0 broken]
   - dtools  ( 2.095.1 -> 2.103.1 )
 
@@ -73,13 +73,13 @@ search nixpkgs here:
 - https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query=
 
 ** compilers
-*** ldc OK ✓ ( 1.30.0 -> 1.40.0-beta5 )
+*** ldc OK ✓ ( 1.30.0 -> 1.40.0-beta6 )
 
 - https://wiki.dlang.org/LDC
 
 - https://github.com/ldc-developers/ldc
   - https://github.com/ldc-developers/ldc/releases
-    nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.0-beta5.tar.gz
+    nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.0-beta6.tar.gz
   - https://github.com/ldc-developers/ldc/issues
 
 - version in nixpkgs:
diff --git a/flake.lock b/flake.lock
index f827f43..7c409a4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,30 +1,12 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733229606,
-        "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
+        "lastModified": 1733656523,
+        "narHash": "sha256-w0FXPfpGhOihoJDiwMsyN1EzpsXi2F8VQ+NVZQSMtys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
+        "rev": "93dc9803a1ee435e590b02cde9589038d5cc3a4e",
         "type": "github"
       },
       "original": {
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 2d9f360..2818f6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
   description = "build dummy D package using dub build tool";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  #inputs.flake-utils.url = "github:numtide/flake-utils";
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
+    #flake-utils,
     ...
   }@inputs: let
     pname = "dummy";
@@ -21,7 +21,7 @@
       runHook postCheck
     '';
     localOverlay = (final: prev: {
-      ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.40.0-beta5
+      ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.40.0-beta6
       dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.109.1
       dub = prev.callPackage ./nix-overlays/dub {  };       # -> ? 1.38.1
       dtools = prev.callPackage ./nix-overlays/dtools {  }; # -> ok 2.103.1
@@ -85,7 +85,7 @@
     in
       with pkgs-ovl; {
         dsh-overlay-dtools = mkShell {
-          name = "overlay - ldc-1.40.0-beta5 - dub-1.38.1 - dtools-2.103.1";
+          name = "overlay - ldc-1.40.0-beta6 - dub-1.38.1 - dtools-2.103.1";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -97,7 +97,7 @@
           inherit shellHook;
         };
         dsh-overlay-ldc-dub = mkShell {
-          name = "overlay - ldc-1.40.0-beta5 - dub-1.38.1";
+          name = "overlay - ldc-1.40.0-beta6 - dub-1.38.1";
           inherit shell;
           inherit devEnv;
           packages = [
@@ -119,7 +119,7 @@
           inherit shellHook;
         };
         dsh-overlay-dtest-tilix = mkShell {
-          name = "overlay - ldc-1.40.0-beta5 - dub-1.38.1 - tilix - gtkd";
+          name = "overlay - ldc-1.40.0-beta6 - dub-1.38.1 - tilix - gtkd";
           inherit shell;
           inherit devEnv;
           packages = [
diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix
index 64c66db..54b3fcc 100644
--- a/nix-overlays/ldc/package.nix
+++ b/nix-overlays/ldc/package.nix
@@ -30,13 +30,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ldc";
-  version = "1.40.0-beta5";
+  version = "1.40.0-beta6";
 
   src = fetchFromGitHub {
     owner = "ldc-developers";
     repo = "ldc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-AaH5xw4hA0LHVx9SU3E+CIZKUHyjJ4TiPaoJnmQZJx4=";
+    hash = "sha256-ErwbOw69HX9epUe8rxzL8Px7iAlZUnfrB9Erq124JnE=";
     fetchSubmodules = true;
   };
 
diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org
index 7211649..97fb894 100644
--- a/org/dlang-nix-flakes.org
+++ b/org/dlang-nix-flakes.org
@@ -405,11 +405,11 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix
 {
   description = "build dummy D package using dub build tool";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  #inputs.flake-utils.url = "github:numtide/flake-utils";
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
+    #flake-utils,
     ...
   }@inputs: let
     pname = "dummy";
@@ -962,17 +962,17 @@ sha256 = "<<ldc_hash>>";
 **** 1.40 OK ✓
 ***** 1.40.0 OK ✓
 
- - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.0-beta5.tar.gz
+ - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.40.0-beta6.tar.gz
  - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz
 
 #+NAME: ldc_version_1_40_0
 #+BEGIN_SRC nix
-1.40.0-beta5
+1.40.0-beta6
 #+END_SRC
 
 #+NAME: ldc_hash_1_40_0
 #+BEGIN_SRC nix
-sha256-AaH5xw4hA0LHVx9SU3E+CIZKUHyjJ4TiPaoJnmQZJx4=
+sha256-ErwbOw69HX9epUe8rxzL8Px7iAlZUnfrB9Erq124JnE=
 #+END_SRC
 
 #+NAME: ldc_llvm_set_1_40_0