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: 30a82bba734b
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: cf82fcd3ae63
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 19, 2019

  1. linux: 4.14.127 -> 4.14.128

    @NeQuissimus
    NeQuissimus committed Jun 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03d8d32 View commit details

  2. linux: 4.19.52 -> 4.19.53

    @NeQuissimus
    NeQuissimus committed Jun 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d03f7cb View commit details

  3. linux: 5.1.11 -> 5.1.12

    @NeQuissimus
    NeQuissimus committed Jun 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cd5da0d View commit details

Commits on Jun 20, 2019

  1. pythonPackages.django: 1.11.20 -> 1.11.21 

    See https://www.djangoproject.com/weblog/2019/jun/03/security-releases/

(cherry picked from commit 1a3e334)
    @lsix
    lsix committed Jun 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eea232f View commit details

  2. pythonPackages.django_2_1: 2.1.7 -> 2.1.8 

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

(cherry picked from commit 952d983)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03be9e3 View commit details

  3. pythonPackages.django_2_1: 2.1.8 -> 2.1.9 

    See https://www.djangoproject.com/weblog/2019/jun/03/security-releases/

(cherry picked from commit 13859d3)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cf82fcd View commit details
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
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "Django";
version = "1.11.20";
version = "1.11.21";

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

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

buildPythonPackage rec {
pname = "Django";
version = "2.1.7";
version = "2.1.9";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
sha256 = "1nkqylj6hz7k45mvwch2y5cc06ncnzbxnzw2d7vbv10azzsdwljh";
};

patches = stdenv.lib.optionals withGdal [
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.127";
version = "4.14.128";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1cvmxh8habwgfczly0zl780d8sa63xkliy79i9a4dvndg4ilqinp";
sha256 = "04r93x9lmx70p2dld0rryjkx6sk3m4krzzmj2h1n370z9xsjqg79";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.52";
version = "4.19.53";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "07iqlh5p68md4xa83bqcfqcwkzvzhbb706bnjjp8jdhcc9aycvi6";
sha256 = "00pbppnn57x7c86cnpv49iwyn2asxpkd9gkspp1p1b5ggq5p6iz6";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.1.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.1.11";
version = "5.1.12";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "06fjjwbfky1vjf77km8fxvxqil214028njr8mn4j69whf8h97z8i";
sha256 = "1avrznzilbvsai8myjhrv8pvjxq4w9dibzgdxbpsr14a56fq2nbi";
};
} // (args.argsOverride or {}))