From 12f33948fbd859b3775202858e3e06eab399d606 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 15 Oct 2023 17:45:40 -0400 Subject: updates incl. ldc-1.35.0, direnv-2.4.0 --- .envrc-nix | 4 ++-- devenv.nix | 2 +- flake.lock | 12 ++++++------ nix-overlays/README | 6 +++--- nix-overlays/ldc/default.nix | 4 ++-- org/config_env.org | 10 +++++++++- org/config_nix.org | 4 ++-- org/nixpkgs_overlays_d_related.org | 35 ++++++++++++++++++++++++++++++++--- shell.nix | 2 +- 9 files changed, 58 insertions(+), 21 deletions(-) diff --git a/.envrc-nix b/.envrc-nix index abbed16..58338fb 100644 --- a/.envrc-nix +++ b/.envrc-nix @@ -1,7 +1,7 @@ NIX_ENFORCE_PURITY=1 # - https://github.com/nix-community/nix-direnv -NixDirEnvVersion="2.3.0" -NixDirEnvSHA="sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=" +NixDirEnvVersion="2.4.0" +NixDirEnvSHA="sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=" if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}" fi diff --git a/devenv.nix b/devenv.nix index 894b0ec..af6d58d 100644 --- a/devenv.nix +++ b/devenv.nix @@ -15,7 +15,7 @@ with pkgs; validatePkgConfig nix-output-monitor nix-tree - jq + jq #gx alejandra git # ❯❯❯ dev diff --git a/flake.lock b/flake.lock index f9394e4..b44c226 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1697009197, + "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "type": "github" }, "original": { diff --git a/nix-overlays/README b/nix-overlays/README index 729b1f5..55b9381 100644 --- a/nix-overlays/README +++ b/nix-overlays/README @@ -16,7 +16,7 @@ compiler and build tools: ldc, dub and dtools, than exist in nixpkgs at the time of publishing, in some cases with additional fixes. nix overlays for (updates nixpkgs, more recent versions of): - - ldc ( 1.30.0 -> 1.34.0 ) + - ldc ( 1.30.0 -> 1.35.0 ) - dub ( 1.23.0 -> 1.34.0 ) [for nix versions 1.31.0 ... 1.33.0 broken] - dtools ( 2.095.1 -> 2.103.1 ) @@ -49,13 +49,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.34.0 ) +*** ldc OK ✓ ( 1.30.0 -> 1.35.0 ) - 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.34.0.tar.gz + nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.35.0.tar.gz - https://github.com/ldc-developers/ldc/issues - version in nixpkgs: diff --git a/nix-overlays/ldc/default.nix b/nix-overlays/ldc/default.nix index 2e34ac8..8624e64 100644 --- a/nix-overlays/ldc/default.nix +++ b/nix-overlays/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.34.0"; - sha256 = "sha256-MAXG6ceSWFOMg5eXZnZ6WePXTzy5CsLLDc5ddXO+txk="; + version = "1.35.0"; + sha256 = "sha256-bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A="; } diff --git a/org/config_env.org b/org/config_env.org index bbf43fe..cfd636a 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -69,10 +69,18 @@ use flake . #+NAME: direnv-version #+BEGIN_SRC sh -2.3.0 +2.4.0 #+END_SRC #+NAME: direnv-sha +#+BEGIN_SRC sh +sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U= +#+END_SRC + +#+BEGIN_SRC sh +2.3.0 +#+END_SRC + #+BEGIN_SRC sh sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8= #+END_SRC diff --git a/org/config_nix.org b/org/config_nix.org index e47359f..798d368 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -349,7 +349,7 @@ with pkgs; validatePkgConfig nix-output-monitor nix-tree - jq + jq #gx alejandra git # ❯❯❯ dev @@ -424,7 +424,7 @@ with pkgs; validatePkgConfig nix-output-monitor nix-tree - jq + jq #gx alejandra git # ❯❯❯ dev diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 4b88f1a..6bd14f5 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -438,7 +438,7 @@ with pkgs; nix-output-monitor #nix-tree #nvd - jq + jq #gx alejandra git # ❯❯❯ dev @@ -759,12 +759,41 @@ sha256 = "<>"; #+NAME: ldc_version #+BEGIN_SRC nix -<> +<> #+END_SRC #+NAME: ldc_hash #+BEGIN_SRC nix -<> +<> +#+END_SRC + +**** 1.35.0 OK ✓ +***** 1.35.0 OK ✓ + +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.35.0.tar.gz + +#+NAME: ldc_version_1_35_0 +#+BEGIN_SRC nix +1.35.0 +#+END_SRC + +#+NAME: ldc_hash_1_35_0 +#+BEGIN_SRC nix +sha256-bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A= +#+END_SRC + +***** 1.35.0-beta1 + +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.35.0-beta1.tar.gz + +#+NAME: ldc_version_1_35_0-beta1 +#+BEGIN_SRC nix +1.35.0-beta1 +#+END_SRC + +#+NAME: ldc_hash_1_35_0-beta1 +#+BEGIN_SRC nix +sha256-qOg7bIG42oxPo4l/ni43V9RkOeP5cmlVeSsW50uv8J8= #+END_SRC **** 1.34.0 OK ✓ diff --git a/shell.nix b/shell.nix index 421a15e..d90aa6c 100755 --- a/shell.nix +++ b/shell.nix @@ -12,7 +12,7 @@ with pkgs; validatePkgConfig nix-output-monitor nix-tree - jq + jq #gx alejandra git # ❯❯❯ dev -- cgit v1.2.3