Merge pull request #572 from nix-community/bash4

drop bash4 from ci

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
         os: [ubuntu-latest]
         # FIXME macos garbage currently collect also nix-shell that runs the test
         #os: [ ubuntu-latest, macos-latest ]
-        variants: [stable, latest, bash4]
+        variants: [stable, latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.github/workflows/update-flake-lock.yml

@@ -2,7 +2,7 @@ name: update-flake-lock
 on:
   workflow_dispatch: # allows manual triggering
   schedule:
-    - cron: '0 0 * * 1,4' # Run twice a week
+    - cron: "0 0 * * 1,4" # Run twice a week
 permissions:
   pull-requests: write
   contents: write

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725194671,
-        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
+        "lastModified": 1746576598,
+        "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
+        "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724833132,
-        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
+        "lastModified": 1746216483,
+        "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
+        "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -23,10 +23,7 @@
     flake-parts.lib.mkFlake { inherit inputs; } (
       { lib, ... }:
       {
-        imports = [
-          ./treefmt.nix
-          ./pkgs/bash4/flake-module.nix
-        ];
+        imports = [ ./treefmt.nix ];
         systems = [
           "aarch64-linux"
           "x86_64-linux"

pkgs/bash4/bash-4.4-patches.nix

@@ -1,27 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-  (patch "001" "03vzy7qwjdd5qvl3ydg99naazas2qmyd0yhnrflgjbbm64axja1y")
-  (patch "002" "0lrwq6vyqism3yqv9s7kzaf3dsl4q5w9r5svcqz279qp7qca083h")
-  (patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi")
-  (patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d")
-  (patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2")
-  (patch "006" "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka")
-  (patch "007" "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y")
-  (patch "008" "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546")
-  (patch "009" "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb")
-  (patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4")
-  (patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx")
-  (patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps")
-  (patch "013" "1djkx0w9v62q78gz3jsvamj1jq53i6hbfrfhhsw86ihwpjnfy98v")
-  (patch "014" "0z5ikcq9zyxw79d0z36r5p0mspnb5piavbv03jmlan1wnknmrxx7")
-  (patch "015" "09n307fi1j257abhm295k6ksmnzw47ka2zhnr0i5lbdnpvn04xnk")
-  (patch "016" "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh")
-  (patch "017" "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp")
-  (patch "018" "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v")
-  (patch "019" "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7")
-  (patch "020" "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q")
-  (patch "021" "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx")
-  (patch "022" "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5")
-  (patch "023" "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g")
-]

pkgs/bash4/default.nix

@@ -1,18 +0,0 @@
-{ bash, fetchurl }:
-
-bash.overrideAttrs (_old: {
-  name = "bash-4.4";
-  src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz";
-    hash = "sha256-2GszksEgLo/1pCOzAuYoTbf49DXqnzm1sbIP06w238s=";
-  };
-
-  # generated with update-patch-set.sh from nixpkgs/pkgs/shells/bash
-  patches = import ./bash-4.4-patches.nix (
-    nr: sha256:
-    fetchurl {
-      url = "mirror://gnu/bash/bash-4.4-patches/bash44-${nr}";
-      inherit sha256;
-    }
-  );
-})

pkgs/bash4/flake-module.nix

@@ -1,14 +0,0 @@
-{ self, withSystem, ... }:
-{
-  flake.packages.x86_64-linux = withSystem "x86_64-linux" (
-    { pkgs, ... }:
-    {
-      bash4 = pkgs.callPackage ./. { };
-      direnv-bash4 = pkgs.direnv.override { bash = self.packages.x86_64-linux.bash4; };
-      test-runner-bash4 = pkgs.callPackage ../../test-runner.nix {
-        nixVersion = "stable";
-        direnv = self.packages.x86_64-linux.direnv-bash4;
-      };
-    }
-  );
-}

tests/direnv_project.py

@@ -22,7 +22,7 @@ class DirenvProject:
     def setup_envrc(self, content: str, strict_env: bool) -> None:
         text = textwrap.dedent(
             f"""
-        {'strict_env' if strict_env else ''}
+        {"strict_env" if strict_env else ""}
         source {self.nix_direnv}
         {content}
         """