Unverified Commit 521dab25 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #323657 from wegank/23.11-unmaintained 

23.11 is unmaintained
parents 529919e9 f136ad96

.github/workflows/periodic-merge-24h.yml

+0 −4
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ jobs: 
        pairs:

          - from: master

            into: haskell-updates

          - from: release-23.11

            into: staging-next-23.11

          - from: staging-next-23.11

            into: staging-23.11

          - from: release-24.05

            into: staging-next-24.05

          - from: staging-next-24.05

lib/trivial.nix

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ in { 
  */

  oldestSupportedRelease =

    # Update on master only. Do not backport.

    2311;

    2405;



  /**

    Whether a feature is supported in all supported releases (at the time of

nixos/tests/systemd-confinement/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ import ../make-test-python.nix { 
          })

        '';

      }

    ]) (lib.cartesianProductOfSets {

    ]) (lib.cartesianProduct {

      user = [ "root" "dynamic-user" "static-user" ];

      privateTmp = [ true false ];

    });

pkgs/development/compilers/llvm/12/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -364,14 +364,14 @@ let 
      patches = [

        (substitute {

          src = ../common/libcxxabi/wasm.patch;

          replacements = [

          substitutions = [

            "--replace-fail" "/cmake/" "/llvm/cmake/"

          ];

        })

      ] ++ lib.optionals stdenv.hostPlatform.isMusl [

        (substitute {

          src = ../common/libcxx/libcxx-0001-musl-hacks.patch;

          replacements = [

          substitutions = [

            "--replace-fail" "/include/" "/libcxx/include/"

          ];

        })

pkgs/development/compilers/llvm/13/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -394,14 +394,14 @@ in let 
      patches = [

        (substitute {

          src = ../common/libcxxabi/wasm.patch;

          replacements = [

          substitutions = [

            "--replace-fail" "/cmake/" "/llvm/cmake/"

          ];

        })

      ] ++ lib.optionals stdenv.hostPlatform.isMusl [

        (substitute {

          src = ../common/libcxx/libcxx-0001-musl-hacks.patch;

          replacements = [

          substitutions = [

            "--replace-fail" "/include/" "/libcxx/include/"

          ];

        })