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: 2de9367299f3
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: c49da6435f31
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 7, 2020

  1. haskellPackages.servant: fix sha256 

    My build server which isn't using cache.nixos.org discovered an
outdated hash in servant:

```
trying https://github.com/haskell-servant/servant/archive/v0.16.2.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   132    0   132    0     0    616      0 --:--:-- --:--:-- --:--:--   616
100  295k    0  295k    0     0   269k      0 --:--:--  0:00:01 --:--:--  384k
unpacking source archive /build/v0.16.2.tar.gz
hash mismatch in fixed-output derivation '/nix/store/i6qgxlqf599wl11rd44jasgmwb78wr6c-source':
  wanted: sha256:0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l
  got:    sha256:0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89
```

(cherry picked from commit 1cbb793)
    @basvandijk
    basvandijk committed Feb 7, 2020
    Copy the full SHA
    5b906e1 View commit details

  2. Merge pull request #79433 from basvandijk/fix-servant-docs-sha256-rel… 

    …ease-19.09

haskellPackages.servant: fix sha256 (release-19.09)
    @basvandijk
    basvandijk authored Feb 7, 2020
    Copy the full SHA
    2b688ed View commit details

  3. pythonPackages.django_1_11: 1.11.24 -> 1.11.28 

    See https://docs.djangoproject.com/en/1.11/releases/1.11.28/ for release
information

(cherry picked from commit 4fa2193)
    @lsix
    lsix committed Feb 7, 2020
    Copy the full SHA
    095f578 View commit details

  4. pythonPackages.django_2_2: 2.2.9 -> 2.2.10 

    See https://docs.djangoproject.com/en/2.2/releases/2.2.10/ for release
information

(cherry picked from commit 2c7f99a)
    @lsix
    lsix committed Feb 7, 2020
    Copy the full SHA
    c49da64 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -726,7 +726,7 @@ self: super: {
owner = "haskell-servant";
repo = "servant";
rev = "v${ver}";
sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
sha256 = "0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89";
}}/doc";
# Needed after sphinx 1.7.9 -> 1.8.3
postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/1_11.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

buildPythonPackage rec {
pname = "Django";
version = "1.11.24";
version = "1.11.28";

src = fetchurl {
url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "1qw97zcsnbnn9dqad1kps48vfaifdkvqb8c3vld6nnvp7x2jfp11";
sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k";
};

patches = stdenv.lib.optionals withGdal [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_2.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.2.9";
version = "2.2.10";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "199mwqs6apdxjm4afqjbvqs98j2927rv2wbgy5vzvqwjhzviyak6";
sha256 = "16h7lw9vnmwarl4pjwc7xnkwmcjq1c79prvfwv8fzixiw65ic9hj";
};

patches = stdenv.lib.optional withGdal