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: 7385e92641d9
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: 5aeab0b2ddb5
Choose a head ref
  • 14 commits
  • 9 files changed
  • 10 contributors

Commits on Aug 3, 2019

  1. python3Packages.cairocffi: correct gdk-pixbuf substitution

    @eadwu
    eadwu committed Aug 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b7ecab3 View commit details

Commits on Aug 4, 2019

  1. groonga: 9.0.4 -> 9.0.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groonga/versions
    @r-ryantm
    r-ryantm committed Aug 4, 2019
    Copy the full SHA
    d798b5e View commit details

Commits on Aug 5, 2019

  1. dbeaver: 6.1.3 -> 6.1.4

    @jojosch
    jojosch committed Aug 5, 2019
    Copy the full SHA
    fbf5a79 View commit details

  2. python37Packages.django_2_2: 2.2.3 -> 2.2.4 

    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-django/versions
    @r-ryantm
    r-ryantm committed Aug 5, 2019
    Copy the full SHA
    c76f10f View commit details

  3. Merge pull request #66046 from r-ryantm/auto-update/python3.7-Django 

    python37Packages.django_2_2: 2.2.3 -> 2.2.4
    @lsix
    lsix authored Aug 5, 2019
    Copy the full SHA
    988655a View commit details

  4. Merge pull request #65931 from r-ryantm/auto-update/groonga 

    groonga: 9.0.4 -> 9.0.5
    @mmahut
    mmahut authored Aug 5, 2019
    Copy the full SHA
    08ee74e View commit details

  5. zeal: use qt5's mkDerivation 

    ref #65399
    @vorot93 @worldofpeace
    vorot93 authored and worldofpeace committed Aug 5, 2019
    Copy the full SHA
    d21d654 View commit details

  6. python37Packages.django_compressor: 2.2 -> 2.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-django_compressor/versions
    @r-ryantm
    r-ryantm committed Aug 5, 2019
    Copy the full SHA
    6b1aab3 View commit details

  7. qjackctl: use qt5's mkDerivation 

    See #65399
    @suhr @worldofpeace
    suhr authored and worldofpeace committed Aug 5, 2019
    Copy the full SHA
    dc95dd4 View commit details

  8. Merge pull request #65864 from eadwu/python3Packages.cairocffi/gdk_pi… 

    …xbuf

python3Packages.cairocffi: correct gdk-pixbuf substitution
    @worldofpeace
    worldofpeace authored Aug 5, 2019
    Copy the full SHA
    4e79568 View commit details

  9. Merge pull request #66055 from r-ryantm/auto-update/python3.7-django_… 

    …compressor

python37Packages.django_compressor: 2.2 -> 2.3
    @lsix
    lsix authored Aug 5, 2019
    Copy the full SHA
    554b6ea View commit details

  10. Merge pull request #66030 from jojosch/dbeaver_6.1.4 

    dbeaver: 6.1.3 -> 6.1.4
    @samueldr
    samueldr authored Aug 5, 2019
    Copy the full SHA
    fb8b7f6 View commit details

  11. python37Packages.emoji: 0.5.2 -> 0.5.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-emoji/versions
    @r-ryantm
    r-ryantm committed Aug 5, 2019
    Copy the full SHA
    3619512 View commit details

  12. Merge pull request #66066 from r-ryantm/auto-update/python3.7-emoji 

    python37Packages.emoji: 0.5.2 -> 0.5.3
    @joachifm
    joachifm authored Aug 5, 2019
    Copy the full SHA
    5aeab0b View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qjackctl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:

stdenv.mkDerivation rec {
mkDerivation rec {
version = "0.5.9";
name = "qjackctl-${version}";

4 changes: 2 additions & 2 deletions pkgs/applications/misc/dbeaver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

stdenv.mkDerivation rec {
name = "dbeaver-ce-${version}";
version = "6.1.3";
version = "6.1.4";

desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "1ngfypx0wbq98rv791zls07h46rnj69qixpslw0xn9bb3ky4snbf";
sha256 = "1l4skcannbzddhm773dm3hwv3a7b3xy569gydcfczgdlgzgmlfjq";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/data/documentation/zeal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
, qtbase, qtimageformats, qtwebkit, qtx11extras
, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:

stdenv.mkDerivation rec {
mkDerivation rec {
name = "zeal-${version}";
version = "0.6.1";

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ index 718aa7f..1a1dcff 100644
+ 'cairo': '@cairo@/lib/libcairo@ext@',
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
+ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+}

-def dlopen(ffi, *names):
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/cairocffi/dlopen-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ index 6061973..3538a58 100644
+ 'cairo': '@cairo@/lib/libcairo@ext@',
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
+ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+}

-def dlopen(ffi, *names):
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.3";
version = "2.2.4";

disabled = !isPy3k;

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

patches = stdenv.lib.optional withGdal
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django_compressor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@
rcssmin, rjsmin, django_appconf }:
buildPythonPackage rec {
pname = "django_compressor";
version = "2.2";
version = "2.3";

src = fetchPypi {
inherit pname version;
sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f";
sha256 = "1pbygd00l0k5p1r959131khij1km1a1grfxg0r59ar2wyx3n7j27";
};
postPatch = ''
substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/emoji/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "emoji";
version = "0.5.2";
version = "0.5.3";

src = fetchPypi {
inherit pname version;
sha256 = "9ae01495fc3fcc04e9136ca1af8cae58726ec5dfaaa92f61f0732cbae9a12fa9";
sha256 = "0kn6qq1h0d6cg70wk0hji6bcwg5s18ys6gfmlmfmx8420ka150dn";
};

checkInputs = [ nose ];
4 changes: 2 additions & 2 deletions pkgs/servers/search/groonga/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {

name = "groonga-${version}";
version = "9.0.4";
version = "9.0.5";

src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
sha256 = "00cyzvk8303y0xcmb0hiy45wj2j6baqqzrfda9f6fv3zlfna1n2g";
sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3";
};

buildInputs = with stdenv.lib;