Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to nixos-23.05 #116

Merged
merged 29 commits into from
Jul 13, 2023
Merged

Update to nixos-23.05 #116

merged 29 commits into from
Jul 13, 2023
+213 −97

Commits on Dec 15, 2021

  1. Bump nixpkgs.nix to pin to nixos-21.11 commit 573095944e7.

    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    27ae28d View commit details
    Browse the repository at this point in the history

  2. Bump nixpkgs submodule to be on 21.11.

    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    49fce8d View commit details
    Browse the repository at this point in the history

  3. Make sure the nixpkgs submodule is looking at NixOS/nixpkgs.

    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    b92d824 View commit details
    Browse the repository at this point in the history

  4. Get the basic example working with 21.11.

    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    dbe55ac View commit details
    Browse the repository at this point in the history

  5. Add more ghc to cabal version mappings.

    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    9c4227e View commit details
    Browse the repository at this point in the history

  6. Bump to ghc-8.10.7. Nixpkgs is on LTS-18.16.

    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    2b08698 View commit details
    Browse the repository at this point in the history

  7. postgresl's tests fail when building with musl, so disable postgrest … 

    …from the set of working Haskell packages
    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    b3f4744 View commit details
    Browse the repository at this point in the history

  8. Apparently there is a curlMinimal top-level derivation now, which als… 

    …o needs to be statified.
    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    f30e2f5 View commit details
    Browse the repository at this point in the history

  9. brotli support was added to curl and it needs to be explicitly disabl… 

    …ed because it pulls in krb5
    @cdepillabout
    cdepillabout committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    6e3e1df View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Make sure static archives symlinks are created for openblas.

    @cdepillabout
    cdepillabout committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    4b1f174 View commit details
    Browse the repository at this point in the history

  2. Make sure blas-ffi uses openblasCompat.

    @cdepillabout
    cdepillabout committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    4fa209c View commit details
    Browse the repository at this point in the history

  3. Disable stackage executable magico because of gfortran linking error.

    @cdepillabout
    cdepillabout committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    83b1822 View commit details
    Browse the repository at this point in the history

  4. Disable stackage packages that depend on postgres.

    @cdepillabout
    cdepillabout committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    d41b96a View commit details
    Browse the repository at this point in the history

  5. Make sure libdevil has libdeflate as buildInput.

    @cdepillabout
    cdepillabout committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    1b57af7 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2021

  1. Drop to postgresql-11 and re-enable all Haskell packages that use pos… 

    …tgres.
    @cdepillabout
    cdepillabout committed Dec 18, 2021
    Configuration menu
    Copy the full SHA
    3d0be9a View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. new ncurses

    @robx @nh2
    robx authored and nh2 committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    14d4ace View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. Update to nixos-23.05

    @nh2
    nh2 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    6bdf17b View commit details
    Browse the repository at this point in the history

  2. Fix approachPkgs being the wrong value. 

    It picked the one from the line below it due to `let rec` instead
of the one from the top-level arguments.
    @nh2
    nh2 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    b11ecc6 View commit details
    Browse the repository at this point in the history

  3. Add comment on curl brotli disabling

    @nh2
    nh2 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    9dfc7f2 View commit details
    Browse the repository at this point in the history

  4. Disable GHC dwarf support

    @nh2
    nh2 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    d90f0ec View commit details
    Browse the repository at this point in the history

  5. Add useArchiveFilesForTemplateHaskell option. 

    The motivation is that @aherrmann and @jonathanlking want to use Bazel
and found that it might it easier to use `.a` files in TH than to try
to provide `.so` AND `.a` files of all dependencies.
    @nh2
    nh2 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    c91a9b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Fix workingStackageExecutables's YAML loading. 

    See https://stackoverflow.com/questions/69564817/typeerror-load-missing-1-required-positional-argument-loader-in-google-col/69581453#69581453
    @nh2
    nh2 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    0236a82 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Add nixpkgs patch to add .a files to bzip2 and zstd

    @nh2
    nh2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    2c20f14 View commit details
    Browse the repository at this point in the history

  2. Make .working pass

    @nh2
    nh2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    70aa4a1 View commit details
    Browse the repository at this point in the history

  3. Remove old compilers: 

    Those no longer packaged by nixpkgs, and 8.8, so that we can assume >= 8.10.
    @nh2
    nh2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    9dd4c43 View commit details
    Browse the repository at this point in the history

  4. Remove workarounds no longer necessary with nixos-23.05

    @nh2
    nh2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    da073d5 View commit details
    Browse the repository at this point in the history

  5. Fix arbtt needing libxcb

    @nh2
    nh2 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    5793932 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Fix more packages. workingStackageExecutables builds on top of nixo… 

    …s-23.05.

Only minimal patches are put on top of the `nixos-23.05` branch to
support more of Stackage. All have nixpkgs PRs.

    nix-build --no-link survey/default.nix -A workingStackageExecutables | wc -l
    368
    @nh2
    nh2 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    63232fc View commit details
    Browse the repository at this point in the history

  2. Implement suggestion for bazel / rules_haskell 

    From #116 (review)
    @nh2
    nh2 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    ce1f737 View commit details
    Browse the repository at this point in the history