Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7000ae2b9a6a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1f8a15dac0f
Choose a head ref
58 contributors

Commits on Mar 31, 2021

  1. nixos/qemu-guest-agent: add statedir

    @Izorkin
    Izorkin committed Mar 31, 2021
    Copy the full SHA
    e65d8e4 View commit details

Commits on Apr 13, 2021

  1. grafana: add google oauth2 config 

    Grafana supports Google OAuth2.
https://grafana.com/docs/grafana/latest/auth/google/
    @jwygoda
    jwygoda committed Apr 13, 2021
    Copy the full SHA
    df3be17 View commit details

Commits on May 11, 2021

  1. jackett: 0.17.1027 -> 0.18.15

    @r-ryantm
    r-ryantm committed May 11, 2021
    Copy the full SHA
    9e5a202 View commit details

Commits on May 12, 2021

  1. all-cabal-hashes: 2021-05-10T22:01:59Z -> 2021-05-11T22:36:02Z 

    This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
    @maralorn @cdepillabout
    maralorn authored and cdepillabout committed May 12, 2021
    Copy the full SHA
    441c9e9 View commit details

  2. hackage-packages.nix: Regenerate based on current config 

    This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
    @maralorn @cdepillabout
    maralorn authored and cdepillabout committed May 12, 2021
    Copy the full SHA
    3d33fad View commit details

  3. hackage2nix: maralorn maintains more packages

    @maralorn @cdepillabout
    maralorn authored and cdepillabout committed May 12, 2021
    Copy the full SHA
    73d4fa3 View commit details

  4. all-cabal-hashes: 2021-05-11T22:36:02Z -> 2021-05-12T11:46:04Z 

    This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
    @cdepillabout
    cdepillabout committed May 12, 2021
    Copy the full SHA
    27157c7 View commit details

  5. hackage-packages.nix: Regenerate based on current config 

    This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
    @cdepillabout
    cdepillabout committed May 12, 2021
    Copy the full SHA
    6773b45 View commit details

  6. haskellPackages.futhark: pin to 0.19.4 for compat with versions 

    versions in stackage is too old to support 0.19.5, so we pin futhark to
a version that does.
    @sternenseemann
    sternenseemann committed May 12, 2021
    Copy the full SHA
    bc10fb7 View commit details

  7. nixos-install-tools: init 

    The essential commands from the NixOS installer as a package

With this package, you get the commands like nixos-generate-config and
nixos-install that you would otherwise only find on a NixOS system, such
as an installer image.

This way, you can install NixOS using a machine that only has Nix.

It also includes the manpages, which are important because the commands
rely on those for providing --help.
    @roberth
    roberth committed May 12, 2021
    Copy the full SHA
    7b0e0ca View commit details

Commits on May 13, 2021

  1. pari: 2.11.4 -> 2.13.1, update sage test expectations

    @collares
    collares committed May 13, 2021
    Copy the full SHA
    9847e84 View commit details

  2. haskellPackages.hnix: remove now unnecessary patch 

    New release 0.13.0.1 introduced support with ref-tf >= 0.5, so we can
remove our patch for that purpose.
    @sternenseemann
    sternenseemann committed May 13, 2021
    Copy the full SHA
    52c8b2d View commit details

  3. haskellPackages.hnix: fix build with stackage relude and semialign 

    haskell-nix/hnix#922 removed a few build-depends
from hnix.cabal which are still required until the following constraints
apply to stackage:

* relude >= 1.0.0.0
* semialign >= 1.2

Luckily, we can simply revert a few commits from master and add
semialign-indexed to resolve this without too much hassle nor
extra-packages (which may cause us trouble through propagation of a
newer relude).
    @sternenseemann
    sternenseemann committed May 13, 2021
    Copy the full SHA
    ad52ecc View commit details

  4. Merge pull request #122706 from sternenseemann/hnix-fix

    @maralorn
    maralorn authored May 13, 2021
    Copy the full SHA
    dac6cc8 View commit details

  5. Merge branch 'master' into haskell-updates

    @maralorn
    maralorn committed May 13, 2021
    Copy the full SHA
    814c7e8 View commit details

Commits on May 14, 2021

  1. krita: add breeze-icons 

    otherwise there are no icons available
    @evils
    evils committed May 14, 2021
    Copy the full SHA
    df2eb33 View commit details

  2. haskellPackages: mark linux-only packages

    @stephank
    stephank committed May 14, 2021
    Copy the full SHA
    bc2528b View commit details

  3. haskellPackages.generic-optics: Fix build

    @maralorn
    maralorn committed May 14, 2021
    Copy the full SHA
    8c4331f View commit details

  4. haskellPackages: Update transitively disabled packages

    @maralorn
    maralorn committed May 14, 2021
    Copy the full SHA
    5caa523 View commit details

Commits on May 15, 2021

  1. release-haskell: add documentation explaining what this file is used for

    @cdepillabout
    cdepillabout committed May 15, 2021
    Copy the full SHA
    ea304f2 View commit details

  2. nix-linter: fix compatibility with hnix≥0.13.0

    @marsam
    marsam committed May 15, 2021
    Copy the full SHA
    96178f4 View commit details

  3. hydra-report.hs: small formatting changes

    @cdepillabout
    cdepillabout committed May 15, 2021
    Copy the full SHA
    39d0424 View commit details

  4. Merge pull request #122806 from stephank/fix-haskell-packages-darwin 

    haskellPackages: mark linux-only packages
    @cdepillabout
    cdepillabout authored May 15, 2021
    Copy the full SHA
    8807e79 View commit details

  5. hackage-packages.nix: Regenerate based on current config 

    This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
    @cdepillabout
    cdepillabout committed May 15, 2021
    Copy the full SHA
    d74484d View commit details

  6. haskellPackages.scrypt: only supports x86

    @dotlambda @sternenseemann
    dotlambda authored and sternenseemann committed May 15, 2021
    Copy the full SHA
    31404dd View commit details

  7. haskellPackages.dhall-nix: unbreak by allowing hnix 0.13 

    Pull revised cabal file before next hackage update.
    @sternenseemann
    sternenseemann committed May 15, 2021
    Copy the full SHA
    8404fa6 View commit details

  8. haskellPackages.dhall-nixpkgs: unbreak by allowing hnix 0.13 

    Pull revised cabal file before next hackage update.
    @sternenseemann
    sternenseemann committed May 15, 2021
    Copy the full SHA
    08d3236 View commit details

  9. Merge pull request #123104 from marsam/fix-nix-linter 

    nix-linter: fix compatibility with hnix≥0.13.0
    @domenkozar
    domenkozar authored May 15, 2021
    Copy the full SHA
    7435004 View commit details

Commits on May 16, 2021

  1. hydra-report.hs: Change Maintainers back to being Maybe Text

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    4ac4ced View commit details

  2. Merge pull request #123069 from cdepillabout/small-script-fixes 

    hydra-report.hs: small formatting changes
    @cdepillabout
    cdepillabout authored May 16, 2021
    Copy the full SHA
    e6c742a View commit details

  3. hackage2nix: sort unsupported platform list

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    195bf4e View commit details

  4. haskellPackages.scrypt: move platform override to hackage2nix configu… 

    …ration
    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    67ebe5a View commit details

  5. haskell-updates: remove tests.writers.x86_64-darwin job from Hydra

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    1ddd893 View commit details

  6. haskellPackages.password, haskellPackages.password-instances, haskell… 

    …Packages.scat: disable builds on arm
    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    6a07f28 View commit details

  7. Merge pull request #123094 from sternenseemann/dhall-nixasteriks-unbreak 

     haskellPackages.dhall-nix{,pkgs}: unbreak by allowing hnix 0.13
    @cdepillabout
    cdepillabout authored May 16, 2021
    Copy the full SHA
    3522110 View commit details

  8. haskell-language-server: disable hydra tests for ghc-9.0

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    0c7f757 View commit details

  9. haskellPackages: add cdepillabout as maintainer for password and term… 

    …onad
    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    5c455da View commit details

  10. haskellPackages: regenerate hackage-packages after adding cdepillabou… 

    …t as maintainer
    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    c59b436 View commit details

  11. hackage2nix: Mark failing builds broken 

    This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    b04a7d6 View commit details

  12. haskell.compiler.ghcHEAD: mark broken on aarch64

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    d1de348 View commit details

  13. Merge remote-tracking branch 'origin/master' into haskell-updates

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    f75fe93 View commit details

  14. haskell2nix: alphabetize the package maintainers list

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    b02bfdf View commit details

  15. haskellPackages.ldgallery-compiler: add pacien as maintainer

    @cdepillabout
    cdepillabout committed May 16, 2021
    Copy the full SHA
    0293c96 View commit details

  16. gitlab-pages: 1.38.0 -> 1.39.0

    @r-ryantm
    r-ryantm committed May 16, 2021
    Copy the full SHA
    d36d679 View commit details

  17. maintainers/scripts/haskell/hydra-report.hs: Remove trailing dots 

    Some job names actually are not followed by a platform name and therefor don‘t have a dot after the name.
    @maralorn
    maralorn committed May 16, 2021
    Copy the full SHA
    cb6ec35 View commit details

  18. Merge remote-tracking branch 'origin/master' into haskell-updates

    @sternenseemann
    sternenseemann committed May 16, 2021
    Copy the full SHA
    9e58964 View commit details

  19. haskellPackages.xml-html-qq: disable broken doctests on aarch64

    @sternenseemann
    sternenseemann committed May 16, 2021
    Copy the full SHA
    c964bdf View commit details

Commits on May 17, 2021

  1. hackage2nix: Add Gabriel439 as maintainer

    @Gabriella439 @cdepillabout
    Gabriella439 authored and cdepillabout committed May 17, 2021
    Copy the full SHA
    4f48006 View commit details

  2. matrix-synapse: 1.33.2 -> 1.34.0 

    ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.34.0
    @Ma27
    Ma27 committed May 17, 2021
    Copy the full SHA
    0dae433 View commit details

  3. nixos/matrix-synapse: room_invite_state_types was deprecated and `r… 

    …oom_prejoin_state` is used now

See https://github.com/matrix-org/synapse/blob/release-v1.34.0/UPGRADE.rst#upgrading-to-v1340
    @Ma27
    Ma27 committed May 17, 2021
    Copy the full SHA
    2addab5 View commit details
Loading