Commit Graph

493030 Commits

Author SHA1 Message Date
Rebecca Turner
17d63282b2 haskell.compiler: allow overriding source with hadrian
Hadrian (the GHC build tool) is built separately from GHC. This means
that if `haskell.compiler.ghc961` is overridden to add patches, those
patches will _only_ be applied to the GHC portion of the build, and not
the Hadrian build. For example, backporting this patch to GHC 9.6.1
failed because the changes to `hadrian/` files were not reflected in the
Nix build:

5ed77deb1b

By lifting `src` and `hadrian` from variables defined in the function
body to parameters with default values, the `hadrian/` files can be
overridden using the `haskell.compiler.ghc961.override` function. For
example:

   self.haskell.compiler.ghc961.override {
     # The GHC 9.6 builder in nixpkgs first builds hadrian with the
     # source tree provided here and then uses the built hadrian to
     # build the rest of GHC. We need to make sure our patches get
     # included in this `src`, then, rather than modifying the tree in
     # the `patchPhase` or `postPatch` of the outer builder.
     src = self.applyPatches {
       src = let
         version = "9.6.1";
       in
         self.fetchurl {
           url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
           sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb";
         };

       patches = [
         # Enable response files for linker if supported
         (self.fetchpatch {
           url = "5ed77deb1b.patch";
           hash = "sha256-dvenK+EPTZJYXnyfKPdkvLp+zeUmsY9YrWpcGCzYStM=";
         })
       ];
     };
   }

Note that we do have to re-declare the `src` we want, but I'm not sure
of a good way to avoid this while also sharing one set of patches
between the GHC and Hadrian builds.
2023-06-08 20:11:52 +02:00
ckie
b940b2455e
Merge pull request #236694 from usertam/patch/minecraft-server-pkg 2023-06-08 21:01:34 +03:00
Doron Behar
f50fc0cfc1
Merge pull request #236636 from r-ryantm/auto-update/cpp-utilities
cpp-utilities: 5.22.0 -> 5.23.0
2023-06-08 20:29:21 +03:00
toonn
782dbaf30f
Merge pull request #234859 from reckenrode/cctools-llvm
cctools-llvm: init at 11.1.0-973.0.1
2023-06-08 19:23:56 +02:00
K900
532ea30c52
Merge pull request #236687 from K900/kde-gear-23.04.2
kde/gear: 23.04.1 -> 23.04.2
2023-06-08 20:04:50 +03:00
7c6f434c
cc5586f88c
Merge pull request #236677 from wegank/xconq-darwin
xconq: add darwin support
2023-06-08 17:00:55 +00:00
Pol Dellaiera
3ea10b9d2c
Merge pull request #235852 from thoughtpolice/nixpkgs/gvisor-update
gvisor: 20221102.1 -> 20230529.0
2023-06-08 18:54:15 +02:00
Pol Dellaiera
9688969ecb
Merge pull request #235881 from zendo/upd/thiefmd
thiefmd: 0.2.5 -> 0.2.7
2023-06-08 18:52:30 +02:00
Fabian Affolter
8efae50f8b
Merge pull request #236547 from fabaff/favicon-pytest-runner
python311Packages.favicon: remove pytest-runner
2023-06-08 18:51:50 +02:00
Pol Dellaiera
2b321dbae0
Merge pull request #235888 from kirillrdy/ent
ent-go: 0.11.0 -> 0.12.3 and unpin go
2023-06-08 18:51:19 +02:00
Fabian Affolter
1e0caf4e11
Merge pull request #236623 from r-ryantm/auto-update/python310Packages.trimesh
python310Packages.trimesh: 3.21.7 -> 3.22.0
2023-06-08 18:50:59 +02:00
Pol Dellaiera
dcc6102683
Merge pull request #235893 from NotAShelf/waycorner
waycorner: init at 0.2.1
2023-06-08 18:50:31 +02:00
Fabian Affolter
da3c44fc48
Merge pull request #236624 from r-ryantm/auto-update/python310Packages.textual
python310Packages.textual: 0.26.0 -> 0.27.0
2023-06-08 18:50:16 +02:00
Fabian Affolter
6ae5941ed8
Merge pull request #236537 from fabaff/past-time-migrate
past-time: migrate to python3.pkgs.buildPythonApplication
2023-06-08 18:47:30 +02:00
Pol Dellaiera
822cdf259b
Merge pull request #236294 from iAmMrinal0/update/google-cloud-sdk
google-cloud-sdk: 426.0.0 -> 433.0.1
2023-06-08 18:46:53 +02:00
Pol Dellaiera
be6c9cb32f
Merge pull request #236504 from dotlambda/libdeltachat-1.116.0
libdeltachat: 1.115.0 -> 1.116.0
2023-06-08 18:43:29 +02:00
Pol Dellaiera
f0fc9fe22d
Merge pull request #236567 from l0b0/fix-activate-lints
nixos/modules: Fix ShellCheck lints
2023-06-08 18:42:38 +02:00
K900
588e307c65 kde/gear: 23.04.1 -> 23.04.2 2023-06-08 19:28:56 +03:00
Sandro
c4146925c7
Merge pull request #219156 from SuperSamus/pcsx2-qt
pcsx2: 1.7.3331 -> 1.7.4554
2023-06-08 18:28:34 +02:00
Florian Klink
308ab862b4
Merge pull request #236680 from emilylange/grafana-agent
grafana-agent: 0.33.2 -> 0.34.0
2023-06-08 19:28:21 +03:00
Ryan Lahfa
a384c9b01d
Merge pull request #234030 from NixOS/cleanup-overlay-mounts
nixosTests: fix tests that relies on an empty rootfs using a bootloader
2023-06-08 18:20:23 +02:00
Sandro
d604f5fd92
Merge pull request #233482 from vdot0x23/submit/jpexs-18.4.1
jpexs: 15.0.0 -> 18.4.1
2023-06-08 18:19:58 +02:00
Sandro
efe2c76c30
Merge pull request #229956 from centromere/py-partiql-parser-0.3.0
python3Packages.py-partiql-parser: init at 0.3.3
2023-06-08 18:17:39 +02:00
usertam
c9e39860d8
minecraft-server: 1.19.4 -> 1.20 2023-06-09 00:11:19 +08:00
teh
88e640fd68
jsonnet: Build with cmake (#236510)
The current build doesn't install all necessary libraries to
use jsonnet from c/c++
2023-06-08 12:09:56 -04:00
Pol Dellaiera
609733b94b
Merge pull request #235282 from ereslibre/bump-unison-M4i
unison: M4h -> M4i
2023-06-08 18:02:15 +02:00
Sandro
a0aea46cc8
Merge pull request #236215 from cherryblossom000/spicetify-2.20.0
spicetify-cli: change sha256 to hash and don't use pname
2023-06-08 18:00:19 +02:00
figsoda
83e3797d0d
Merge pull request #236087 from romildo/upd.qogir-icon-theme
qogir-icon-theme: 2023-02-23 -> 2023-06-05
2023-06-08 11:17:29 -04:00
figsoda
6183e4f9a7
Merge pull request #235860 from terlar/add-pacproxy
pacproxy: init at 2.0.5
2023-06-08 11:14:38 -04:00
José Romildo Malaquias
a3288a144b
Merge pull request #236335 from Icy-Thought/Fluent-icon-theme
fluent-icon-theme: 2023-02-01 -> 2023-06-07
2023-06-08 12:05:49 -03:00
emilylange
4b951d921e
grafana-agent: 0.33.2 -> 0.34.0
https://github.com/grafana/agent/blob/v0.34.0/CHANGELOG.md
https://github.com/grafana/agent/releases/tag/v0.34.0
diff: https://github.com/grafana/agent/compare/v0.33.2...v0.34.0
2023-06-08 17:03:50 +02:00
Weijia Wang
97a5d1c93a xconq: add darwin support 2023-06-08 17:57:33 +03:00
figsoda
c184a80efa
Merge pull request #236563 from figsoda/erg 2023-06-08 10:56:27 -04:00
Raito Bezarius
89952f7bb6 nixosTests.luks: mount the host Nix store
Same rationale as in caf6f41e2e.
2023-06-08 16:56:07 +02:00
Raito Bezarius
ff3936e14b nixos/tests/lvm2/systemd-stage-1: mount the host Nix store
Same rationale as in caf6f41e2e.
2023-06-08 16:56:04 +02:00
Raito Bezarius
59891e405d nixosTests.systemd-initrd-networkd-ssh: bootDevice -> rootDevice
Missed deprecation fixup during the bootDisk PR.
2023-06-08 16:56:01 +02:00
Raito Bezarius
c1f0de6e20 nixosTests.systemd-initrd-luks-keyfile: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:58 +02:00
Raito Bezarius
bbfedea0a1 nixosTests.systemd-initrd-luks-password: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:55 +02:00
Raito Bezarius
efe64826c9 nixosTests.systemd-initrd-luks-tpm2: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:52 +02:00
Raito Bezarius
e190364fd7 nixosTests.systemd-initrd-networkd-ssh: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:49 +02:00
Raito Bezarius
db811f12eb nixosTests.systemd-initrd-swraid: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:45 +02:00
Raito Bezarius
de7f3cb2fa nixosTests.systemd-initrd-luks-fido2: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:29 +02:00
Raito Bezarius
955a77e1c4 nixosTests.systemd-initrd-btrfs-raid: mount the host Nix store
Same rationale as caf6f41e2e.
2023-06-08 16:55:25 +02:00
Raito Bezarius
caf6f41e2e nixosTests.initrd-luks-empty-passphrase: mount the host nix store
This is necessary because this test relies on switching the root fs to an empty one which
does not have a Nix store available in stage 1, therefore, we have to make this test
host-store only.

A better fix in the long term is to evaluate whether this is worth to enable a proper
Nix store image for it with EROFS?
2023-06-08 16:55:04 +02:00
Weijia Wang
63410a7779
Merge pull request #236651 from wegank/boost-deprecate-drop
boost1{68-74}: drop
2023-06-08 17:36:32 +03:00
7c6f434c
e4d2ceab3d
Merge pull request #234201 from 7c6f434c/fix-untagged-version
coding-conventions: include the preceding upstream version
2023-06-08 14:36:01 +00:00
Martin Weinelt
d56e6a4da3
Merge pull request #235895 from mweinelt/hdb5_1_10-vulnerable
hdf5_1_10: mark vulnerable
2023-06-08 16:25:55 +02:00
Michele Guerini Rocco
107ad50f57
Merge pull request #236614 from rnhmjoj/pr-bdf2psf
bdf2psf: 1.220 -> 1.221
2023-06-08 16:18:04 +02:00
stepech
902f575416 burpsuite: 2023.5.2 -> 2023.5.3
https://portswigger.net/burp/releases/professional-community-2023-5-3
2023-06-08 16:15:33 +02:00
Maximilian Bosch
05fa952d15
Merge pull request #236392 from r-ryantm/auto-update/wiki-js
wiki-js: 2.5.298 -> 2.5.299
2023-06-08 16:04:50 +02:00