11753 Commits
Author SHA1 Message Date
sternenseemann a7ed61ebf7 stack: adjust overrides to stack 3.9.1
The main change is that stack now needs Cabal >= 3.14. GHC 9.10
unfortunately needs a lot of coaxing to build the Setup.hs against it,
so the override is essentially specific to GHC 9.10.3 now.

(As an aside, I think the fact that we can't really apply the
constraints from setup-depends with Setup.hs is a strong argument for
adding (optional?) support for cabal-install based builds…)
2026-01-26 11:16:41 +01:00
nixpkgs-ci[bot]andGitHub 2576eaefa8 Merge b3ac5a8a8c into haskell-updates 2026-01-26 00:25:29 +00:00
quantenzitrone 7d8132a92c treewide: remove references to the xorg namespace in pkgs (automated)
this creates some eval errors that will be fixed in the next commit

done with the following script:

```fish
\#!/usr/bin/env fish

set packagesjson (nix eval --impure --json --expr '
let
  lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
  name: _:
  if name == "lib" then
    lib
  else if name == "config" then
    { allowAliases = false; }
  else
    name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)

set one (grep '^    [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^  [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)

for arg in $one $two
    set oname $arg
    set nname (echo $packagesjson | jq -r .$oname)

    if test $nname = null
        echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
        continue
    end

    echo $oname "->" $nname

    # replace basic xorg.$name references
    for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
        # special cases
        sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file

        # replace
        sd -F "xorg.$oname" "$nname" $file

        # fixup function arguments

        # prevent duplicate function args
        if grep -E " ($oname|$nname),\$" $file >/dev/null
            continue
        end

        if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg

            if grep ' xorg,$' $file >/dev/null
                sd ' xorg,$' " xorg,
                $nname," $file

            else if grep ' xorg ? .*,$' $file >/dev/null
                sd 'xorg( ? .*),$' "xorg\$1,
                $nname," $file

            else
                sd -F 'xorg,' "$nname,
                xorg," $file
            end

        else # case there is no more xorg..* so we can just replace the function arg
            sd 'xorg(| ? .*),.*$' "$nname," $file
        end
    end
end

nix fmt
```
2026-01-25 22:28:09 +01:00
K900 087bbe25ec Merge remote-tracking branch 'origin/staging-next' into staging 2026-01-25 21:09:20 +03:00
nixpkgs-ci[bot]andGitHub 8965888bb3 Merge master into staging-nixos 2026-01-25 18:07:01 +00:00
sternenseemann 68c04108e2 haskellPackages.cabal2nix-unstable: 2025-11-20 -> 2026-01-25
Makes haskellPackages stop referencing pkgs.xorg. See also
<https://github.com/NixOS/nixpkgs/issues/479553>.
2026-01-25 12:48:45 +01:00
Michael DanielsandGitHub 006ecdbdeb treewide: fix typos (#479869) 2026-01-24 21:36:44 +00:00
nixpkgs-ci[bot]andGitHub 6299d7eaae Merge 055fdf03b0 into haskell-updates 2026-01-24 21:26:30 +00:00
sternenseemann 0aa332c7e2 haskellPackages.hpack_0_39_1: disable test cases requiring network 2026-01-24 22:20:39 +01:00
sternenseemann 7d7913958b haskellPackages.pantry_0_11_2: disable test suite requiring network 2026-01-24 22:20:39 +01:00
nixpkgs-ci[bot]andGitHub d2116888c1 Merge staging-next into staging 2026-01-24 12:07:36 +00:00
sternenseemannandGitHub 5cf564ad24 haskellPackages.warp: stop including Paths_ module by default (#483175) 2026-01-24 10:27:55 +00:00
sternenseemannandGitHub 9a66fda7e5 haskellPackages: remove pkgs.nix from wrapper scripts where unnecessary (#481003) 2026-01-24 10:16:18 +00:00
Michael Daniels 3378ed55e9 Merge "$(git merge-base master staging)" (565e0c1f0f) into haskell-updates 2026-01-23 20:01:43 -05:00
Jade Lovelace bc964b1813 haskellPackages.warp: stop including Paths_ module by default
This was made possible to disable, which we should really probably just
do. It might make some HTTP servers not return their version in a
header, but that feels like an antipattern anyhow.

See: https://github.com/yesodweb/wai/pull/1044
See: https://github.com/NixOS/nixpkgs/blob/ecdb2e3a81213177cde9ce769e5f086ff24387b6/pkgs/development/haskell-modules/configuration-darwin.nix#L363-L372
2026-01-23 12:52:44 -08:00
nixpkgs-ci[bot]andGitHub 8f23ed0423 Merge staging-next into staging 2026-01-23 00:20:07 +00:00
Dyego Aurélio 28096cc5e3 treewide: apply nixfmt 1.2.0 2026-01-22 18:37:56 -03:00
Wolfgang Walther d8480eb930 haskellPackages.MIP: enable tests
This was fixed upstream.
2026-01-22 21:12:37 +01:00
Malte OttandGitHub a177dfafae haskellPackages.ghcup: deprecate (#481229) 2026-01-22 17:43:56 +00:00
Ai-Ya-Ya a415f7340b haskellPackages.ghcup: deprecate
ghcup does not have a relevant use case in NixOS
2026-01-22 17:17:34 +00:00
nixpkgs-ci[bot]andGitHub 3ea1269656 Merge staging-next into staging 2026-01-22 12:08:41 +00:00
nixpkgs-ci[bot]andGitHub 7bad341585 Merge master into staging-next 2026-01-22 12:08:02 +00:00
Alexandre Esteves 933e3378b8 haskellPackages: remove unneeded jailbreaks 2026-01-22 10:34:48 +00:00
Arnout Engelen 77be50b9bd ghc: enable object determinism by default
This is particularly relevant for us because we include
objects in haskell derivation outputs, and this fixes
reproducibility for a significant number of those.

Towards #151347
2026-01-22 09:43:07 +01:00
Wolfgang WaltherandGitHub 3e1de1b238 haskellPackages: fix strictDeps build for a few packages (#481801) 2026-01-21 18:43:40 +00:00
sternenseemann 0de98984ae haskellPackages.proto3-wire: drop released patch 2026-01-21 11:23:27 +01:00
sternenseemann 5760d29ded haskellPackages.yesod-static: fix test suite with mime-types >= 0.1.2.1 2026-01-21 11:17:26 +01:00
95e9853767 haskellPackages: clarify the nature of hspec-discover toolDepends
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2026-01-20 20:50:38 +00:00
Colin 3f7b764840 haskellPackages.hspec-wai: fix strictDeps build 2026-01-19 01:32:31 +00:00
Colin 9f5633cdfa haskellPackages.http-date: fix strictDeps build 2026-01-19 01:29:46 +00:00
Colin 5caff24080 haskellPackages.word8: fix strictDeps build 2026-01-19 01:28:40 +00:00
Colin fad607c3a2 haskellPackages.http-types: fix strictDeps build 2026-01-19 01:16:14 +00:00
Colin 9e808795cf haskellPackages.yaml: fix strictDeps build 2026-01-19 01:04:21 +00:00
Colin eccf0f6e11 haskellPackages.unliftio: fix build with strictDeps 2026-01-19 01:03:19 +00:00
Colin 8b62337df7 haskellPackages.safe-exceptions: simplify override 2026-01-19 01:03:19 +00:00
Ai-Ya-Ya 2d75a2d9d2 haskellPackages.xz: jailbreak
xz builds with QuickCheck 2.15
https://github.com/hasufell/lzma-static/pull/15
2026-01-18 02:49:19 +00:00
sternenseemann a6af5da7f3 haskellPackages.cli-nix: note unnecessarily baked in dep on pkgs.nix 2026-01-17 12:52:45 +01:00
sternenseemann 5b94303f1a update-nix-fetchgit: remove pkgs.nix from the wrapper
We can assume that the user has Nix installed. Not having it in the
wrapper prevents pulling in a specific version of C++ Nix when the user
may prefer another version or Lix etc.
2026-01-17 12:52:45 +01:00
sternenseemann dff47de40b nvfetcher: remove pkgs.nix from the wrapper
We don't know what Nix implementation the user prefers and nvfetcher
mostly needs nix-prefetch-url which is stable enough.
2026-01-17 12:52:44 +01:00
sternenseemann aa8111d879 niv: remove pkgs.nix from the wrapper
We don't know what Nix implementation the user prefers and niv mostly
needs nix-prefetch-url which is stable enough.
2026-01-17 12:52:44 +01:00
Michael Daniels 4756e50806 Merge commit '825a8a4f4670b6d8cea42b0e294dd237ddff22bc' into haskell-updates 2026-01-16 20:49:53 -05:00
Michael Daniels d4d05c6e1b Merge branch 'master' into staging-next 2026-01-15 22:02:49 -05:00
nixpkgs-ci[bot]andGitHub bb8c8969a5 Merge fb34f684a5 into haskell-updates 2026-01-16 00:23:43 +00:00
Gaël James ee66ab3d6e haskell-modules: use tag = instead of rev = refs/tags/... 2026-01-15 18:27:43 +01:00
K900 eff3523324 Merge remote-tracking branch 'origin/master' into staging-next 2026-01-15 10:41:33 +03:00
Gergő GutyinaandGitHub 16b21aaedf various: move to pkgs/by-name (#479415) 2026-01-15 00:44:50 +00:00
nixpkgs-ci[bot]andGitHub b29b652c51 Merge d6bc8a1403 into haskell-updates 2026-01-15 00:22:28 +00:00
quantenzitrone 1dbd8e14ef fltk_{1_3,1_4}: move to pkgs/by-name, rename from fltk{13,14}
this shouldn't create any rebuilds

Sorry this changes the "do not edit" haskell file.
How is someone supposed to rename packages that are used in there if
you first have to change the mapping in the cabal2nix repo?
2026-01-14 18:52:29 +01:00
nixpkgs-ci[bot]andGitHub 04e1f77c1e Merge master into staging-next 2026-01-14 12:07:56 +00:00
Jacek GalowiczandGitHub 411ef177d5 cachix: 1.9.1 -> 1.10.1 (#479808) 2026-01-14 07:13:10 +00:00