0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Commit graph

3681 commits

Author SHA1 Message Date
Winter
a19cd4ffb1 Revert "treewide: replace rev with tag"
This reverts commit 65a333600d.

This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.

It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).

A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.

[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e458
2025-04-08 02:57:25 -04:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Sander
41876dc432
cachix: 1.7.6 -> 1.7.7 2025-03-15 15:00:55 +01:00
sternenseemann
a74d7b0f66 haskellPackages.text-icu: disable test(s) broken by icu >= 76
Output changed from GMT+1 to MEZ in one case, I think we can safely
ignore that.
2025-02-18 10:31:20 +01:00
Dominik Xaver Hörl
ca42117450 haskellPackages.pango: patch to make gtk build with newer (>= 1.56) pango 2025-02-12 12:26:52 +01:00
sternenseemann
ccb3770e1a pandoc_3_6: fix incorrect dependency versions
5dfa2d6f55 missed the fact that pandoc 3.6
newly requests non Stackage LTS 22 versions of some packages. Since
pandoc_3_6 wasn't actually tested in CI, this was missed.

The new version typst uses its Paths_ for determining its version,
so we need to remove the incorrectly generated references. See
<9707b74ce6>.

On haskell-updates, no pandoc_3_* exists anymore, so we don't need to
do anything. We may want to add quarto to the jobset, but it's quite
heavy…

Resolves #375884.
2025-01-23 23:41:28 +01:00
Sander
219f9c0190
cachix: 1.7.5 -> 1.7.6 2025-01-23 14:20:45 +04:00
K900
0fd5f209c1 Merge remote-tracking branch 'origin/master' into staging-next 2025-01-17 11:30:03 +03:00
Morgan Jones
3af07aa4d3
haskellPackages.{hz3,z3}: add compile flags for newer Z3 versions 2025-01-11 17:48:51 -08:00
github-actions[bot]
ded5a5e552
Merge master into staging-next 2025-01-09 00:14:35 +00:00
sternenseemann
4ba7115786 haskellPackages.lukko: fix ofd locking on 32bit Linux platforms
Quoting the patch:

> Previously, OFD locking was broken on 32-bit, because it would somehow
> end up using the 64-bit fcntl() function, but pass it 32-bit off_t
> values in struct flock.  To fix this, tell libc to use always use
> 64-bit file offsets.
>
> This is the same fix that was applied for a similar issue in GHC.
2025-01-08 21:27:33 +01:00
sternenseemann
e73ff8c460 haskellPackages.nspace: disable tests 2024-12-31 22:03:32 +01:00
sternenseemann
a8f9a9f6fe haskellPackages.lawful-conversions: relax lower bounds of test suite 2024-12-31 13:40:42 +01:00
sternenseemann
3b4be0dc07 haskellPackages.provide: relax lower bound on lens 2024-12-31 13:40:42 +01:00
sternenseemann
c7a72e43b3 haskellPackages.pfile: allow hspec == 2.11.* 2024-12-31 13:38:29 +01:00
sternenseemann
31aab29bd8 haskellPackages.xz: make sure we are using pkgs.xz, allow tasty 1.4
lzma-static is deprecated in favor of xz which can finally be built
against the system library instead of vendoring and statically linking
xz in the Hackage package.

I've set all packages that vendor lzma somehow related to these packages
to dontDistribute since we don't really want to redistribute potentially
outdated versions of xz (maybe we should mark these as broken,
actually).
2024-12-31 13:38:29 +01:00
sternenseemann
164d44fcaf haskellPackages.libxml-sax: drop obsolete override
Upstream has fixed the implicit declarations in a new release. That
release also includes the test suite in the default package which
unfortunately segfaults, so the build is failing again.
2024-12-31 13:38:29 +01:00
sternenseemann
542c92b9a5 haskellPackages.hevm: drop obsolete patches 2024-12-27 14:25:32 +01:00
Joseph Warren
7016a8c384 haskellPackages.opencascade-hs: provide non standard include dirs
As of [this PR](https://github.com/NixOS/cabal2nix/pull/630)
opencascade-hs does not require the dependency on opencascade-occt to be
manually specified. It does however still require the include path to be
defined.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2024-12-27 14:07:53 +01:00
sternenseemann
581f185b6c git-annex: update sha256 for 10.20241202 2024-12-27 13:12:31 +01:00
sternenseemann
f43f9987c5 haskellPackages.repa*: drop obsolete patches
haskellPackages.repa-{eval,scalar}: drop stale broken flag
2024-12-26 19:02:36 +01:00
sternenseemann
d8d3d878f7 haskellPackages.gi-gtk_4: 4.0.9 -> 4.0.11 2024-12-26 15:41:54 +01:00
sternenseemann
fe2fe9981e cabal-install: adjust overrides for 3.14.1.0 2024-12-26 15:41:54 +01:00
sternenseemann
0bbb00e8ee haskellPackages: use Cabal 3.14.1.0 over 3.14.0.0 2024-12-26 15:41:54 +01:00
sternenseemann
628a40319a jacinda: build with happy-2.1.3 2024-12-26 15:41:54 +01:00
sternenseemann
5dfa2d6f55 pandoc_3_6: init at 3.6
pandoc_3_5: remove at 3.5
2024-12-26 15:41:54 +01:00
sternenseemann
835bc93724 haskellPackages: link upstream issues for GCC 14 workarounds
I've contacted the maintainer of libxml-sax directly as the package does
not seem to have a public issue tracker.

(cherry picked from commit 1ad0cb4d35)
2024-12-22 13:57:34 +01:00
sternenseemann
1139a6eeff haskellPackages.libxml-sax: disable gcc14 implicit fun decl -Werror
(cherry picked from commit 25e269c421)
2024-12-22 13:57:34 +01:00
sternenseemann
9edd83fa21 haskellPackages.termbox-bindings-c: disable implicit fun -Werror
Work around gcc 14 making implicit-function-declaration an error.

(cherry picked from commit fb7fe3b3a8)
2024-12-22 13:57:33 +01:00
sternenseemann
1f4a0eb852 haskellPackages.{hd5-lite,bindings-libcddb}: disable gcc 14 -Werror
(cherry picked from commit dc09700185)
2024-12-22 13:57:33 +01:00
sternenseemann
3cf4ebd8c2 haskellPackages.HsSyck: implicit function decl may not fail build
This is another gcc 14 workaround.

haskellPackages.HsOpenSSL: don't silence incompatible-pointer-types

Disabling the error is a better option than silencing the warning which
still applies…

(cherry picked from commit 9c577069d9)
2024-12-22 13:57:33 +01:00
sternenseemann
b3692b3250 haskellPackages.cabal2nix-unstable: 2024-12-04 -> 2024-12-22
Includes https://github.com/NixOS/cabal2nix/pull/638.
2024-12-22 13:47:07 +01:00
sternenseemann
1ad0cb4d35 haskellPackages: link upstream issues for GCC 14 workarounds
I've contacted the maintainer of libxml-sax directly as the package does
not seem to have a public issue tracker.
2024-12-22 13:42:53 +01:00
sternenseemann
25e269c421 haskellPackages.libxml-sax: disable gcc14 implicit fun decl -Werror 2024-12-22 13:20:23 +01:00
sternenseemann
fb7fe3b3a8 haskellPackages.termbox-bindings-c: disable implicit fun -Werror
Work around gcc 14 making implicit-function-declaration an error.
2024-12-22 13:02:06 +01:00
sternenseemann
dc09700185 haskellPackages.{hd5-lite,bindings-libcddb}: disable gcc 14 -Werror 2024-12-21 20:31:20 +01:00
sternenseemann
9c577069d9 haskellPackages.HsSyck: implicit function decl may not fail build
This is another gcc 14 workaround.

haskellPackages.HsOpenSSL: don't silence incompatible-pointer-types

Disabling the error is a better option than silencing the warning which
still applies…
2024-12-21 20:15:26 +01:00
sternenseemann
1a8d021ea7 haskellPackages.espial: allow esqueleto >= 3.5.12 2024-12-21 19:40:42 +01:00
sternenseemann
5705c90b8a darcs: build with tls < 2.0 again
Upstream tries to do something clever with restricting tls
directly (even though it is an indirect dependency). We could easily
provide crypton-connection >= 0.4 and tls >= 2.0.6, but it only wants
that for GHC >= 9.8 claiming it is not possible for earlier versions.
2024-12-21 19:28:38 +01:00
sternenseemann
7a84c154c9 git-annex: update sha256 for 10.20241031 2024-12-21 03:55:13 +01:00
sternenseemann
c61c0e1718 stack: fix build by providing pantry >= 0.10
Consistent usage of lself prevents inconsistent dependencies.
2024-12-21 03:54:03 +01:00
sternenseemann
26896ed13a jacinda: fix build by providing happy >= 2.1
This requires a few adjustments for happy's test suite due to
10a0fe5ca5 (diff-36b847ebf9c22d0651fe4856d7a8acb47ee2c483c79f1ccf0ed8c84889c9a394)
2024-12-21 03:43:37 +01:00
sternenseemann
bc93387c1a Merge branch staging-next into haskell-updates 2024-12-16 21:14:37 +01:00
sternenseemann
7c9c5797f8 haskellPackages.yi-language: drop obsolete patch 2024-12-16 15:58:29 +01:00
sternenseemann
f1fb86cc6f haskellPackages.HsOpenSSL: work around -Werror failures
See the linked issues. Probably due to gcc >= 14.
2024-12-15 23:58:12 +01:00
sternenseemann
1ad609120c Merge branch staging-next into haskell-updates 2024-12-14 18:36:42 +01:00
github-actions[bot]
212858a5e9
Merge master into staging-next 2024-12-11 06:05:17 +00:00
Atemu
648124c83b
quarto: use pandoc 3.5 (#357687) 2024-12-11 01:36:49 +01:00
sternenseemann
0edc9de869 Merge branch staging into haskell-updates 2024-12-03 14:52:17 +01:00