Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db2ebc7bd640
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7c8e08c7f28
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 20, 2018

  1. Merge pull request #39062 from vaibhavsagar/bump-all-cabal-hashes 

    all-cabal-hashes: bump to 2018-04-19T00:28:09Z
(cherry picked from commit eb0943f)

This allows us to use newer packages from Hackage.
    @peti @vaibhavsagar
    peti authored and vaibhavsagar committed Apr 20, 2018
    Copy the full SHA
    4a73c1f View commit details

Commits on Apr 26, 2018

  1. Merge pull request #39199 from vaibhavsagar/release-18.03 

    Merge pull request #39062 from vaibhavsagar/bump-all-cabal-hashes
    @peti
    peti authored Apr 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    04d9a46 View commit details

  2. release-combined: don't include tests.chromium 

    The chromium package will frequently time out . Note that this is unrelated to the test but a side effect because the test depends on chromium.

https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.chromium.x86_64-linux

See also #39476
    @matthewbauer
    matthewbauer committed Apr 26, 2018
    Copy the full SHA
    f7c8e08 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 nixos/release-combined.nix
  2. +2 −2 pkgs/data/misc/hackage/default.nix
2 changes: 1 addition & 1 deletion nixos/release-combined.nix
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ in rec {
nixos.ova.x86_64-linux or []

#(all nixos.tests.containers)
nixos.tests.chromium.x86_64-linux or []
#nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.gnome3)
4 changes: 2 additions & 2 deletions pkgs/data/misc/hackage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl }:

fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/30eca1c57b9358eff984ab93dbfd213d6b08706b.tar.gz";
sha256 = "0kd5y2jlydbr1jv2ckdpsn2ialbxk2aj19c8i0brzz0wwzirg7q5";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz";
sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12";
}