diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-05 06:00:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-05 06:00:59 +0000 |
commit | 397840014f7509f5f36935798f7424999668eaa6 (patch) | |
tree | 7420d38f156c3bdad895d7085f4d2fbc9e9f5b67 /pkgs/top-level | |
parent | 740525486e1399710ed99c841f3efdc7e5539c37 (diff) | |
parent | 6225a5106080e3c6e150315e0b55c190ccd5044c (diff) | |
download | nixlib-397840014f7509f5f36935798f7424999668eaa6.tar nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.gz nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.bz2 nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.lz nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.xz nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.zst nixlib-397840014f7509f5f36935798f7424999668eaa6.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/release-haskell.nix | 12 |
5 files changed, 13 insertions, 56 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e655c34c7e82..a0124b0089c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -164,7 +164,7 @@ mapAliases ({ # these are for convenience, not for backward compat and shouldn't expire clang6Stdenv = lowPrio llvmPackages_6.stdenv; - clang7Stdenv = lowPrio llvmPackages_7.stdenv; + clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 clang8Stdenv = lowPrio llvmPackages_8.stdenv; clang9Stdenv = lowPrio llvmPackages_9.stdenv; clang10Stdenv = lowPrio llvmPackages_10.stdenv; @@ -175,6 +175,9 @@ mapAliases ({ clang15Stdenv = lowPrio llvmPackages_15.stdenv; clang16Stdenv = lowPrio llvmPackages_16.stdenv; + clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 + clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 + ### D ### dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 @@ -559,6 +562,10 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; + lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 + lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86ac26d711e1..b5336abd3678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7238,7 +7238,7 @@ with pkgs; compass = callPackage ../development/tools/compass { }; cone = callPackage ../development/compilers/cone { - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_13; }; conda = callPackage ../tools/package-management/conda { }; @@ -15648,7 +15648,6 @@ with pkgs; clang = llvmPackages.clang; clang_6 = llvmPackages_6.clang; - clang_7 = llvmPackages_7.clang; clang_8 = llvmPackages_8.clang; clang_9 = llvmPackages_9.clang; clang_10 = llvmPackages_10.clang; @@ -15667,10 +15666,6 @@ with pkgs; llvmPackages = llvmPackages_6; }; - clang-tools_7 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_7; - }; - clang-tools_8 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_8; }; @@ -16600,7 +16595,6 @@ with pkgs; lld = llvmPackages.lld; lld_6 = llvmPackages_6.lld; - lld_7 = llvmPackages_7.lld; lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; @@ -16613,7 +16607,6 @@ with pkgs; lldb = lldb_14; lldb_6 = llvmPackages_6.lldb; - lldb_7 = llvmPackages_7.lldb; lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; @@ -16626,7 +16619,6 @@ with pkgs; llvm = llvmPackages.llvm; llvm_6 = llvmPackages_6.llvm; - llvm_7 = llvmPackages_7.llvm; llvm_8 = llvmPackages_8.llvm; llvm_9 = llvmPackages_9.llvm; llvm_10 = llvmPackages_10.llvm; @@ -16664,13 +16656,6 @@ with pkgs; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries; }); - llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_7.tools; - targetLlvm = targetPackages.llvmPackages_7.llvm or llvmPackages_7.llvm; - targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries; - }); - llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; @@ -17752,9 +17737,7 @@ with pkgs; ### End of CuboCore - maude = callPackage ../development/interpreters/maude { - stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; - }; + maude = callPackage ../development/interpreters/maude { }; me_cleaner = callPackage ../tools/misc/me_cleaner { }; @@ -28986,8 +28969,6 @@ with pkgs; vdo = callPackage ../os-specific/linux/vdo { }; - windmill = callPackage ../servers/windmill {}; - windows = callPackages ../os-specific/windows {}; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -40033,7 +40014,6 @@ with pkgs; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; }); rinetd = callPackage ../servers/rinetd { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b8f11100d39c..44ff6a6dd59e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -65,7 +65,8 @@ in { compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { - llvmPackages = pkgs.llvmPackages_6; + # Should be llvmPackages_6 which has been removed from nixpkgs + llvmPackages = null; }; ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { @@ -80,20 +81,6 @@ in { llvmPackages = pkgs.llvmPackages_12; }; - ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - bootPkgs = - # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - # 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities - # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isMusl then - packages.ghc8102Binary - else - packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; - ghc88 = compiler.ghc884; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { bootPkgs = # the oldest ghc with aarch64-darwin support is 8.10.5 @@ -484,12 +471,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc884 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc884; - ghc = bh.compiler.ghc884; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; - ghc88 = packages.ghc884; ghc8107 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107; ghc = bh.compiler.ghc8107; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e788578d669f..e6f54a1401ba 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -593,6 +593,7 @@ let github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; gluten = callPackage ../development/ocaml-modules/gluten { }; + gluten-eio = callPackage ../development/ocaml-modules/gluten/eio.nix { }; gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { }; gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 39ea843bcea2..f1b5645e52b6 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -60,7 +60,6 @@ let # list of all compilers to test specific packages on released = with compilerNames; [ - ghc884 ghc8107 ghc902 ghc924 @@ -390,10 +389,6 @@ let ghcjs = {}; ghcjs810 = {}; - - # Can't be built with musl, see meta.broken comment in the drv - integer-simple.ghc884 = {}; - integer-simple.ghc88 = {}; }; # Get some cache going for MUSL-enabled GHC. @@ -501,8 +496,6 @@ let ] released; funcmp = released; haskell-language-server = lib.subtractLists [ - # Support ceased as of 1.9.0.0 - compilerNames.ghc884 # Support ceased as of 2.3.0.0 compilerNames.ghc8107 # Not yet supported @@ -534,12 +527,10 @@ let compilerNames.ghc981 ] released; ghc-api-compat = [ - compilerNames.ghc884 compilerNames.ghc8107 compilerNames.ghc902 ]; ghc-bignum = [ - compilerNames.ghc884 compilerNames.ghc8107 ]; ghc-lib = lib.subtractLists [ @@ -554,13 +545,11 @@ let ghc-source-gen = [ # Feel free to remove these as they break, # ghc-source-gen currently doesn't support GHC 9.4 - compilerNames.ghc884 compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc928 ]; ghc-tags = lib.subtractLists [ - compilerNames.ghc884 compilerNames.ghc981 ] released; hashable = lib.subtractLists [ @@ -653,7 +642,6 @@ let constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8107Binary - jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc924 |