diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2024-12-09 18:33:20 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2024-12-09 18:33:20 -0500 |
| commit | cb5a80a280777a2603242270c125ec5b384adab3 (patch) | |
| tree | 0b61001217c1efbac104818787025c9b1926de77 | |
| parent | nix build, dub, take account of nixpkgs build changes (diff) | |
flake.nix, removed flake-utils
| -rw-r--r-- | flake.lock | 36 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | org/config_nix.org | 4 | ||||
| -rw-r--r-- | org/nixpkgs_overlays_d_related.org | 10 |
4 files changed, 10 insertions, 44 deletions
@@ -18,24 +18,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "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, @@ -54,14 +36,13 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "spine-d-overlay": "spine-d-overlay" } }, "spine-d-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -94,21 +75,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "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", @@ -1,7 +1,7 @@ { description = "a sisu like document parser search form"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; + #inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.spine-d-overlay = { url = "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -10,7 +10,7 @@ outputs = { self, nixpkgs, - flake-utils, + #flake-utils, spine-d-overlay, ... }@inputs: let diff --git a/org/config_nix.org b/org/config_nix.org index 60d92ee..8e87696 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -24,7 +24,7 @@ { description = "a sisu like document parser search form"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; + #inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.spine-d-overlay = { url = "<<sisudoc_dlang_nix_overlay_src>>"; inputs.nixpkgs.follows = "nixpkgs"; @@ -33,7 +33,7 @@ outputs = { self, nixpkgs, - flake-utils, + #flake-utils, spine-d-overlay, ... }@inputs: let diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 6f76fdc..aba78be 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -346,11 +346,11 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix { description = "dub d package manager"; 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 name = "dev-dub"; @@ -852,17 +852,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 |