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: e4ee5b916079
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: a59b6608f97a
Choose a head ref
  • 10 commits
  • 5 files changed
  • 7 contributors

Commits on May 22, 2019

  1. graylog: 3.0.1 -> 3.0.2 

    (cherry picked from commit d537c4c)
Reason: The update fixes a bug with the handling of quoted PaloAlto
input values.
    Tristan Helmich (omniIT) committed May 22, 2019
    Copy the full SHA
    8cc317e View commit details

Commits on May 23, 2019

  1. Merge pull request #61864 from fadenb/graylog_3.0.2_backport 

    [19.03] graylog: 3.0.1 -> 3.0.2
    @c0bw3b
    c0bw3b authored May 23, 2019
    Copy the full SHA
    72718be View commit details

  2. python3Packages.django_2_2: init at 2.2.1 

    This introduces Django-2.2, the new LTR version of django.

For the time being, django-1.11 continues to be LTR in nixpkgs
django-2.2 is introduced to prepare the migration.

(cherry picked from commit d2de73f)
    @lsix
    lsix committed May 23, 2019
    Copy the full SHA
    78a2563 View commit details

  3. python37Packages.djangorestframework: 3.9.1 -> 3.9.2 (#57403) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-djangorestframework/versions

(cherry picked from commit d6a86be)
    @r-ryantm @lsix
    r-ryantm authored and lsix committed May 23, 2019
    Copy the full SHA
    29024ce View commit details

  4. python37Packages.djangorestframework: 3.9.2 -> 3.9.3 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-djangorestframework/versions

(cherry picked from commit 38af84a)
    @r-ryantm @lsix
    r-ryantm authored and lsix committed May 23, 2019
    Copy the full SHA
    4f65d66 View commit details

  5. terraform_0_12: 0.12.0-alpha4 -> 0.12.0-beta1 (#56767) 

    (cherry picked from commit 4545ae5)
    @kalbasit @basvandijk
    kalbasit authored and basvandijk committed May 23, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d13f83f View commit details

  6. terraform_0_12: 0.12.0-beta1 -> 0.12.0-rc1 

    (cherry picked from commit 25c0847)
    @zimbatm @basvandijk
    zimbatm authored and basvandijk committed May 23, 2019
    Copy the full SHA
    7584617 View commit details

  7. terraform_0_11: 0.11.13 -> 0.11.14 

    (cherry picked from commit 2bcc8de)
    @basvandijk
    basvandijk committed May 23, 2019
    Copy the full SHA
    ad6ba0e View commit details

  8. terraform_0_12: 0.12.0-rc1 -> 0.12.0 

    (cherry picked from commit 8669561)
    @basvandijk
    basvandijk committed May 23, 2019
    Copy the full SHA
    54a3408 View commit details

  9. Merge pull request #61946 from basvandijk/terraform-0.12-release-19.03 

    Backport terraform-0.12 and 0.11.14 to release-19.03
    @basvandijk
    basvandijk authored May 23, 2019
    Copy the full SHA
    a59b660 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/networking/cluster/terraform/default.nix
View file
Original file line number Diff line number Diff line change
@@ -88,17 +88,17 @@ let
plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
in rec {
terraform_0_11 = pluggable (generic {
version = "0.11.13";
sha256 = "014d2ibmbp5yc1802ckdcpwqbm5v70xmjdyh5nadn02dfynaylna";
version = "0.11.14";
sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});

terraform_0_11-full = terraform_0_11.full;

terraform_0_12 = pluggable (generic {
version = "0.12.0-alpha4";
sha256 = "16cwqxxb19m91d7rx7awri1awz7d8cfnrv0rbql9rbg5qjyqxcp9";
version = "0.12.0";
sha256 = "1lycy789wzh1fcg7qcl540546bgw4b9kjlbh2j4hnm0bs9696b2a";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
38 changes: 38 additions & 0 deletions pkgs/development/python-modules/django/2_2.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{ stdenv, buildPythonPackage, fetchPypi, substituteAll,
isPy3k,
geos, gdal, pytz, sqlparse,
withGdal ? false
}:

buildPythonPackage rec {
pname = "Django";
version = "2.2.1";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "1spa701phl8ha7qmfr89hwpa43kf52zbrs3xyc0rlvxianykrk3g";
};

patches = stdenv.lib.optional withGdal
(substituteAll {
src = ./1.10-gis-libs.template.patch;
geos = geos;
gdal = gdal;
extension = stdenv.hostPlatform.extensions.sharedLibrary;
})
;

propagatedBuildInputs = [ pytz sqlparse ];

# too complicated to setup
doCheck = false;

meta = with stdenv.lib; {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
license = licenses.bsd3;
maintainers = with maintainers; [ georgewhewell lsix ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/djangorestframework/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, django }:
buildPythonPackage rec {
version = "3.9.1";
version = "3.9.3";
pname = "djangorestframework";

src = fetchPypi {
inherit pname version;
sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66";
sha256 = "1w1rc8cpw89sll5wsg1aj1w3klk91a1bsdz9y4zhg5xrc0qpd118";
};

# Test settings are missing
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre_headless }:

stdenv.mkDerivation rec {
version = "3.0.1";
version = "3.0.2";
name = "graylog-${version}";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "07a003c2d9hj6aczlbai279z9bw50yk0a6qx1cw44f8p08y6dnqi";
sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj";
};

dontBuild = true;
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2304,6 +2304,8 @@ in {
gdal = self.gdal;
};

django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };

django_1_8 = callPackage ../development/python-modules/django/1_8.nix { };

django-allauth = callPackage ../development/python-modules/django-allauth { };