summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update pkgs/games/papermc/default.nix•••Co-authored-by: Joel <jyooru+github@protonmail.ch> (cherry picked from commit 53d7554d151c54489175fedca7f45a85d72ee59f) origin/backport-149989-to-release-21.11Aaron Janse2021-12-121-1/+1
* Update pkgs/games/papermc/default.nix•••Co-authored-by: Joel <jyooru+github@protonmail.ch> (cherry picked from commit 86f325b117bcc45d44f05a5a4da89c2d03bb41c4) Aaron Janse2021-12-121-1/+1
* papermc: 1.17.1r97 -> 1.17.1r399•••(cherry picked from commit f994bbb83f3d2fe3053b9bd16f25689b76e9356f) Aaron Janse2021-12-121-2/+2
* Merge pull request #150304 from NixOS/backport-148696-to-release-21.11•••[Backport release-21.11] Fix the syntax error on tt-rss config fileGuillaume Girol2021-12-111-4/+4
|\
| * tt-rss-module handle situations without any password•••(cherry picked from commit 0eaecd60cb90f6c7247751cee304476869a72fd1) origin/backport-148696-to-release-21.11Mats Rauhala2021-12-111-2/+2
| * Fix the syntax error on tt-rss config file•••(cherry picked from commit de16da59f269861f40e35035d917954c31901263) Mats Rauhala2021-12-111-3/+3
* | Merge pull request #150301 from NixOS/backport-150293-to-release-21.11•••[Backport release-21.11] qt515.qtwebkit: fix build on darwinPavol Rusnak2021-12-111-15/+0
|\ \
| * | qt515.qtwebkit: fix build on darwin•••This fixes the build on darwin by correcting the patch which no longer applies. (cherry picked from commit 1bc0716555ef9184117a61c4d0d133f0b6c85464) Pavol Rusnak2021-12-111-15/+0
| |/
* | Merge pull request #149568 from NixOS/staging-next-21.11Martin Weinelt2021-12-1140-152/+413
|\ \ | |/ |/|
| * Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-1122-55/+106
| |\
| * \ Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-1045-542/+690
| |\ \
| * \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-0921-112/+212
| |\ \ \
| * | | | python3Packages.django_2: 2.2.24 -> 2.2.25•••(cherry picked from commit 24f959ebf3a0c638c91a80960dee701bedd3a663) Martin Weinelt2021-12-071-2/+2
| * | | | python3Packages.django_3: 3.2.9 -> 3.2.10•••(cherry picked from commit b4ad673b1fc58970209528718b0b496e362f0169) Martin Weinelt2021-12-071-2/+2
| * | | | Merge pull request #148770 from risicle/ris-libjxl-CVE-2021-22563-r21.11Martin Weinelt2021-12-081-1/+15
| |\ \ \ \
| | * | | | libjxl: add patch for CVE-2021-22564Robert Scott2021-12-051-1/+15
| * | | | | Merge pull request #148368 from NixOS/backport-146477-to-staging-21.11Martin Weinelt2021-12-082-0/+87
| |\ \ \ \ \
| | * | | | | python39: backport patch to accomodate system library changes in Big Sur•••(cherry picked from commit 9738723b2486cfe9988abbff0c873cce5cba1849) (cherry picked from commit a43a2eacb322c3799aa6eadd0061db1a3c176b78) Martin Weinelt2021-12-032-0/+87
| * | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2021-12-0865-928/+3784
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-0865-928/+3784
| | |\ \ \ \ \ \
| * | | | | | | | haskell.compiler.*: use targetCC for hasGold check•••This is a bit shorter and more consistent with the rest of the file. (cherry picked from commit 19fc2292942cfcb7c07dade739989a64545d812f) sternenseemann2021-12-074-4/+4
| * | | | | | | | haskell.compiler.*: assert that host->target == build->target tools•••CC, CXX, LD, AR, …, LLC, OPT and CLANG will be invoked by GHC's build system at build time in the build->target role. However, since we are passing absolute paths, they will get saved in GHC's settings file and later invoked at runtime, when they should be host->target. This means that the build->target and host->target tools need to be the same for our built GHC to work properly which is what we guard using these new asserts. Being able to drop these asserts would be a step towards cross-compiling GHC (as opposed to building a GHC cross-compiler which still works). (cherry picked from commit c23e14e33f207dd38b6cc50401493d640a4745db) sternenseemann2021-12-075-5/+45
| * | | | | | | | haskell.compiler.ghc921: check if ld.gold is available in useLdGold•••Since 4c75874560d114032e3d3ee0e6ffe9dd880a3859 it is possible to introspect if ld.gold is contained in the used bintools, so we can also check if it is available before deciding to use it as done in the other GHC derivations in 0908812372ad7f983645530de1d32e1563adacd3. (cherry picked from commit b2e47081059a37d6edbd7f1d89066cb7f640297e) sternenseemann2021-12-071-1/+2
| * | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2021-12-0724-122/+196
| |\| | | | | | |
| | * | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-0724-122/+196
| | |\ \ \ \ \ \ \
| * | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2021-12-0633-180/+556
| |\| | | | | | | | | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-0633-180/+556
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #148662 from NixOS/backport-148658-to-staging-21.11•••[Backport staging-21.11] Revert "neard: fix build"Jan Tojnar2021-12-051-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "neard: fix build"•••It breaks at runtime since it still depends on PyGTK. https://github.com/NixOS/nixpkgs/pull/148193 is the proper fix. (cherry picked from commit 341032407f6371857490da6ced6b88930f335a8a) Jan Tojnar2021-12-051-4/+4
| * | | | | | | | | | Merge pull request #148660 from NixOS/backport-148193-to-staging-21.11•••[Backport staging-21.11] dbus-python: fix configure dependency on python3Jan Tojnar2021-12-051-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | dbus-python: fix configure dependency on python3•••See https://github.com/NixOS/nixpkgs/pull/144095#pullrequestreview-804181903 (cherry picked from commit 02b507e0dc0509b8934888a31103ad6d5c70c97c) dadada2021-12-051-0/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2021-12-0519-37/+80
| |\| | | | | | | |
| | * | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-0519-37/+80
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2021-12-0439-223/+339
| |\| | | | | | | | |
| | * | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-0439-223/+339
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | haskell.compiler.*: disable useLLVM also for SPARC and PowerPC•••These targets also have NCG support, but they are tested less (in fact SPARC seems to be untested atm) and may have issues. In such cases being able to fallback to -fllvm without rebuilding the compiler could be useful. OTOH GHC will default to -fasm and the backends probably work well enough in most cases. (cherry picked from commit 8f1a52ac33fb9a441713261c35cecab7b5331512) sternenseemann2021-12-025-3/+13
| * | | | | | | | | | | haskell.compiler.*: don't useLLVM if aarch64-darwin NCG is available•••aarch64-darwin NCG was added in 9.2.1 which makes it unnecessary to include LLVM in the wrapper. (cherry picked from commit ef081bf3056f3facd2a0b85b172c5c730a0404e8) sternenseemann2021-12-022-2/+4
| * | | | | | | | | | | haskell.compiler.*: use `isScript` over grepping for `#!`•••(cherry picked from commit a7c564596e195cf9aa46ad2762f78e4d9cc9789b) sternenseemann2021-12-025-15/+15
| * | | | | | | | | | | haskell.compiler.*: prefix PATH with runtimeDeps•••This will prevent freak accidents where the wrong tools are used because they are in PATH by chance. (cherry picked from commit 035f20bc6bf809c7be9bb5b6d4dd19b0a2df9d17) sternenseemann2021-12-025-15/+15
| * | | | | | | | | | | pkgsMusl.haskell.compiler.ghc884: return accurate platforms•••(cherry picked from commit b2c2215f606426a8bc8368b344f14a5123f14f3c) sternenseemann2021-12-021-2/+9
| * | | | | | | | | | | haskell.compiler.ghc884: re-enable aarch64-linux•••Since we inherit the platform list from the bootstrap GHC, we get differing lists depending on which platform we evaluate the platform list on (depending on whether 8.10.2 or 8.6.5 is used). This leads to Hydra thinking aarch64-linux is not supported as it evaluates on x86_64-linux usually. (cherry picked from commit 55b8d8c1bfd055f7efecf175fb7e528b193d2762) sternenseemann2021-12-021-1/+4
| * | | | | | | | | | | haskell.compiler.*: be clear about LLVM build->target role•••Since LLVM itself doesn't depend on target at all, this doesn't change anything *in effect* (i. e. rebuild count should be zero), but it is more clear about the intention and what LLVM is used for here (i. e. in depsBuildTarget). (cherry picked from commit 156d8d619c727351d40ba67df60521b33698bf0c) sternenseemann2021-12-026-16/+16
| * | | | | | | | | | | haskell.compiler.ghc865Binary: remove aarch64-linux from platforms•••GHC 8.6.5 will always segfault on aarch64-linux and at this point it's not realistic we'll ever fix this. (cherry picked from commit b9f15821064edcb61d9c5e06285fbbde775edeb9) sternenseemann2021-12-021-2/+1
| * | | | | | | | | | | haskell.compiler.*: upgrade to latest supported LLVM version•••Source: * (8.6.5: https://www.haskell.org/ghc/download_ghc_8_6_5.html) * (8.8.4: https://www.haskell.org/ghc/download_ghc_8_8_4.html) * (8.10.2: https://www.haskell.org/ghc/download_ghc_8_10_2.html) * 8.10.7: https://www.haskell.org/ghc/download_ghc_8_10_7.html * (9.0.1: https://www.haskell.org/ghc/download_ghc_9_0_1.html) * 9.2.1: https://www.haskell.org/ghc/download_ghc_9_2_1.html * HEAD: https://gitlab.haskell.org/ghc/ghc/-/blob/3ab3631f41efe9a1ae32a5b1f709152228edb09a/configure.ac#L674 (cherry picked from commit 9e1f438a7656b5ab2247eca914902525207f12cc) sternenseemann2021-12-021-8/+8
| * | | | | | | | | | | haskell.compiler.ghc901: drop LLVM version to 9•••GHC 9.0.1 only supports LLVM 9 and spews a lot of warnings about LLVM 10 when using the LLVM backend atm. See also: https://www.haskell.org/ghc/download_ghc_9_0_1.html (cherry picked from commit 5a568ea36fc596b349ac088418c627d4a1488ce0) sternenseemann2021-12-021-2/+2
| * | | | | | | | | | | haskellPackages: always inherit llvmPackages from ghc's passthru•••This means we only have to update the llvmPackages attribute in one place now and should prevent situations like with 8.6.5 where different versions would be used in the package set compared to the compiler build. Drop comments in the configuration-ghc-X.Y.x.nix files as well, since LLVM version isn't tied to the compiler minor version at all (e. g. 8.10.2 and 8.10.7 have different support ranges). (cherry picked from commit d7ff8061beed6ce1c141066fd268cdbb5acc0dd1) sternenseemann2021-12-029-11/+12
| * | | | | | | | | | | haskell.compiler.ghc865Binary: build with correct LLVM version•••See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/compiler/backends/llvm/installing#llvm-support (cherry picked from commit e191321866b1d754eed23a577837f183c76581f7) sternenseemann2021-12-021-1/+3
| * | | | | | | | | | | ghcWithPackages: rename withLLVM to useLLVM•••useLLVM is what we are using in the GHC derivations already -- for better or for worse -- so we should rename the argument here for consistency which we are free to do as this is purely internal at the moment (with overriding being impossible). (cherry picked from commit c32095b400076b89d63920805dc95533607e78d2) sternenseemann2021-12-021-3/+3
| * | | | | | | | | | | ghcWithPackages: GHC 8.10.7 still needs LLVM for aarch64-darwin•••This check was wrong and caused by a bit of confusion on my part. GHC >= 8.10.5 && < 9 supports aarch64-darwin via LLVM and GHC >= 9.2.1 introduces the NCG backend for aarch64-darwin. (cherry picked from commit 2f98c1824c750c2d0c6440b8c57a039092cb0cd3) sternenseemann2021-12-021-1/+1
| * | | | | | | | | | | ghcWithPackages: list missing targets with NCG available•••Based on https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms, although it sadly doesn't list when the backends were introduced. * PowerPC, x86 (and x86_64) and Sparc have been supported for longer. * aarch64-darwin is new in 9.2.1 and backported to 8.10.5, 8.10.6 and 8.10.7 (check is dumb here since we'll grep for 8.10.7 anyways when upgrading) Fixes ghcWithPackages failing to evaluate on aarch64-darwin because of missing support for the platform in LLVM 9's compiler-rt. (cherry picked from commit 571f3e504bf504844e8705d52f8552d6b6d115d4) sternenseemann2021-12-021-1/+10
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 05:22:37 +0000