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: 2d0a2044b3cc
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: 56e5dad3d8bb
Choose a head ref

Commits on Aug 15, 2019

  1. varnish5: fix build

    Jonathan Ringer committed Aug 15, 2019
    Copy the full SHA
    c74db73 View commit details
  2. varnishPackages: pin python to varnish python version

    Jonathan Ringer committed Aug 15, 2019
    Copy the full SHA
    9fe0ee5 View commit details

Commits on Aug 16, 2019

  1. mixxx: 2.2.1 -> 2.2.2

    matthiasbeyer committed Aug 16, 2019
    Copy the full SHA
    45a961f View commit details

Commits on Aug 17, 2019

  1. vimPlugins: update (#66749)

    timokau authored Aug 17, 2019
    Copy the full SHA
    1eddfda View commit details
  2. Copy the full SHA
    ecd4d03 View commit details
  3. Copy the full SHA
    b63980d View commit details
  4. python3Packages.deprecated: init at 1.2.6

    tilpner authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    a4cc672 View commit details
  5. python3Packages.PyGithub: 1.36 -> 1.43.8

    tilpner authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    a261f43 View commit details
  6. pythonPackage.pre-commit: move to python-modules

      Add pkgs.gitAndTools.pre-commit alias
      Add pkgs.pre-commit alias
    Jonathan Ringer authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    2b2d891 View commit details
  7. python3Packages.pylibgen: 2.0.1 -> 2.0.2

    Jonathan Ringer authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    7055dee View commit details
  8. pythonPackages.capstone: 3.0.4 -> 3.0.5

      * Tested the package build
        - *NOT* tested the packages relying on capstone...
      * Added `setupPyBuildFlags` to avoid the error
      "ERROR: capstone-3.0.5.post1-py3-none-manylinux1_x86_64.whl is not a
      supported wheel on this platform."
    Pamplemousse authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    4edfccc View commit details
  9. unittest-data-providers: init at 1.0.1

    Jonathan Ringer authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    51f401f View commit details
  10. doh-proxy: 0.0.8 -> 0.0.9

    Jonathan Ringer authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    5775243 View commit details
  11. discord-canary: 0.0.91 -> 0.0.92

    tadeokondrak authored and FRidh committed Aug 17, 2019
    Copy the full SHA
    249b56f View commit details
  12. Copy the full SHA
    0cc8dfc View commit details
  13. Merge pull request #66715 from matthiasbeyer/update-mixxx

    mixxx: 2.2.1 -> 2.2.2
    markuskowa authored Aug 17, 2019
    Copy the full SHA
    1d1eee5 View commit details
  14. pyprof2calltree: move to python-packages

    pyprof2calltree is hard-coded to pythonPackages and fails for Python 3 profile results. See #66511.
    Since it can also be used as a library it makes sense to move it into pythonPackages.
    SFrijters committed Aug 17, 2019
    Copy the full SHA
    7d38a62 View commit details
  15. nvme-cli: 1.8.1 -> 1.9

    primeos committed Aug 17, 2019
    Copy the full SHA
    b09407a View commit details
  16. Merge pull request #66712 from SFrijters/pyprof2calltree-as-package

    pyprof2calltree: move to python-packages
    Mic92 authored Aug 17, 2019
    Copy the full SHA
    40e8655 View commit details
  17. Copy the full SHA
    7aa0222 View commit details
  18. Copy the full SHA
    b58bfbd View commit details
  19. androidStudioPackages.{dev,canary}: 3.6.0.5 -> 3.6.0.6

    Unfortunately this update will probably still cause the builds from
    canary 3 to break and require manual steps to resolve these issues:
    https://issuetracker.google.com/issues/136077720#comment9
    
    I.e. manually update the Gradle plugin here (e.g. directly to alpha06):
    dependencies {
       classpath 'com.android.tools:gradle:3.6.0-alpha03'
    }
    
    But as the current status is "Won't Fix (Infeasible)" [0] there's no
    point in skipping the updates for the dev/canary channel.
    
    [0]: https://issuetracker.google.com/issues/136077720#comment10
    primeos committed Aug 17, 2019
    Copy the full SHA
    7a66c79 View commit details
  20. Merge pull request #66564 from jonringer/fix-varnish

    varnish5: fix build
    Mic92 authored Aug 17, 2019
    Copy the full SHA
    2baf41b View commit details
  21. Merge branch 'android-studio-canary-updates' into master

    This commit merges the following updates for
    androidStudioPackages.{dev,canary}:
    
    * androidStudioPackages.{dev,canary}: 3.6.0.5 -> 3.6.0.6
    * androidStudioPackages.{dev,canary}: 3.6.0.4 -> 3.6.0.5
    * androidStudioPackages.{dev,canary}: 3.6.0.3 -> 3.6.0.4
    
    These updates where initially delayed due to a bug that causes problems
    with the automatic update of the Android Studio Gradle plugin.
    But as the current status is "Won't Fix (Infeasible)" [0] there's no
    point in skipping the updates for the dev/canary channel any longer.
    
    Unfortunately this update will probably still cause the builds from
    canary 3 to break and require manual steps to resolve this issue.
    The required manual steps can be found here:
    https://issuetracker.google.com/issues/136077720#comment9
    
    I.e. manually update the Gradle plugin here (e.g. directly to alpha06):
    dependencies {
       classpath 'com.android.tools:gradle:3.6.0-alpha03'
    }
    
    [0]: https://issuetracker.google.com/issues/136077720#comment10
    primeos committed Aug 17, 2019
    Copy the full SHA
    56e5dad View commit details
8 changes: 6 additions & 2 deletions doc/quick-start.xml
Original file line number Diff line number Diff line change
@@ -210,8 +210,12 @@
</listitem>
<listitem>
<para>
Optionally commit the new package and open a pull request, or send a patch
to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.
Optionally commit the new package and open a pull request <link
xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or
use <link
xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477">
the Patches category</link> on Discourse for sending a patch without a
GitHub account.
</para>
</listitem>
</orderedlist>
2 changes: 1 addition & 1 deletion nixos/modules/services/monitoring/loki.nix
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ in {
PrivateTmp = true;
ProtectHome = true;
ProtectSystem = "full";
DecvicePolicy = "closed";
DevicePolicy = "closed";
NoNewPrivileges = true;
WorkingDirectory = cfg.dataDir;
};
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mixxx/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

mkDerivation rec {
name = "mixxx-${version}";
version = "2.2.1";
version = "2.2.2";

src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg";
};

buildInputs = [
6 changes: 3 additions & 3 deletions pkgs/applications/editors/android-studio/default.nix
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ let
sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j";
};
latestVersion = { # canary & dev
version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"
build = "191.5618338";
sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519";
version = "3.6.0.6"; # "Android Studio 3.6 Canary 6"
build = "192.5787298";
sha256Hash = "1rri8b5nkxj65hq13s5d31fy08llf3ad9s5mn56ridd4nsy2c5df";
};
in rec {
# Attributes are named by their corresponding release channels
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.91";
version = "0.0.92";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/0.0.91/discord-canary-0.0.91.tar.gz";
sha256 = "0sw5m4z5k29rzqrsxbvjqd8fxjwd9jn7nbq65nyg7f0d790rhpy8";
url = "https://dl-canary.discordapp.net/apps/linux/0.0.92/discord-canary-0.0.92.tar.gz";
sha256 = "16sq8r6cqjhjm6743hp0rvinbi6br1mkpk62clh62xx84j8g7ny7";
};
};
}.${branch}
Original file line number Diff line number Diff line change
@@ -57,11 +57,11 @@ let

in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.26.1";
version = "1.26.2";

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1s48mgya1gvidk0fmm7pifhqj2k0dc9xdq3h5ifz9kivjp7h0z09";
sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk";
};

phases = [ "unpackPhase" "installPhase" ];
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ let

lab = callPackage ./lab { };

pre-commit = callPackage ./pre-commit { };
pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;

pass-git-helper = python3Packages.callPackage ./pass-git-helper { };

8 changes: 6 additions & 2 deletions pkgs/development/python-modules/capstone/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,15 @@

buildPythonPackage rec {
pname = "capstone";
version = "3.0.4";
version = "3.0.5.post1";

setupPyBuildFlags = [
"--plat-name x86_64-linux"
];

src = fetchPypi {
inherit pname version;
sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225";
sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04";
};

patches = [
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/deprecated/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchPypi, buildPythonPackage,
wrapt, pytest, tox }:

buildPythonPackage rec {
pname = "Deprecated";
version = "1.2.6";

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

postPatch = ''
# odd broken tests, don't appear in GitHub repo
rm tests/demo_classic_usage*.py
'';

propagatedBuildInputs = [ wrapt ];
checkInputs = [ pytest ];
meta = with stdenv.lib; {
homepage = "https://github.com/tantale/deprecated";
description = "Python @deprecated decorator to deprecate old python classes, functions or methods";
platforms = platforms.all;
license = licenses.mit;
maintainers = with maintainers; [ tilpner ];
};
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
{ lib, fetchPypi, buildPythonApplication, pythonOlder
, aspy-yaml
, cached-property
, cfgv
, futures
, identify
, importlib-metadata
, importlib-resources
, nodeenv
, six
, toml
, virtualenv
}:

buildPythonApplication rec {
pname = "pre-commit";
version = "1.18.1";

@@ -19,13 +32,13 @@ with python3Packages; buildPythonApplication rec {
toml
virtualenv
importlib-metadata
] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources
++ stdenv.lib.optional (pythonOlder "3.2") futures;
] ++ lib.optional (pythonOlder "3.7") importlib-resources
++ lib.optional (pythonOlder "3.2") futures;

# Tests fail due to a missing windll dependency
# slow and impure
doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
description = "A framework for managing and maintaining multi-language pre-commit hooks";
homepage = https://pre-commit.com/;
license = licenses.mit;
15 changes: 6 additions & 9 deletions pkgs/development/python-modules/pyGithub/default.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
{ stdenv, fetchFromGitHub
, buildPythonPackage, python-jose, pyjwt }:
, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }:

buildPythonPackage rec {
pname = "PyGithub";
version = "1.36";
name = pname + "-" + version;
version = "1.43.8";

src = fetchFromGitHub {
owner = "PyGithub";
repo = "PyGithub";
rev = "v${version}";
sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w";
sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw";
};

postPatch = ''
# requires network
echo "" > github/tests/Issue142.py
'';
propagatedBuildInputs = [ python-jose pyjwt ];
propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ];
doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/PyGithub/PyGithub;
description = "A Python (2 and 3) library to access the GitHub API v3";
28 changes: 15 additions & 13 deletions pkgs/development/python-modules/pylibgen/default.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
{ buildPythonPackage, lib, fetchPypi
, isPy3k
{ lib, buildPythonPackage, fetchFromGitHub
, pythonOlder
, requests
, pytest
, pre-commit
}:

buildPythonPackage rec {
pname = "pylibgen";
version = "2.0.1";
version = "2.0.2";
disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e";
src = fetchFromGitHub {
owner = "joshuarli";
repo = pname;
rev = "v${version}";
sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1";
};

disabled = !isPy3k;

propagatedBuildInputs = [ requests ];

checkInputs = [ pytest ];
checkInputs = [ pytest pre-commit ];

# no tests in PyPI tarball
# literally every tests does a network call
doCheck = false;

meta = {
meta = with lib; {
description = "Python interface to Library Genesis";
homepage = https://pypi.org/project/pylibgen/;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.nico202 ];
license = licenses.mit;
maintainers = [ maintainers.nico202 ];
};
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildPythonApplication, fetchFromGitHub }:
{ lib, buildPythonPackage, fetchFromGitHub }:

buildPythonApplication rec {
buildPythonPackage rec {
pname = "pyprof2calltree";
version = "1.4.4";

21 changes: 21 additions & 0 deletions pkgs/development/python-modules/unittest-data-provider/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ buildPythonPackage
, lib
, fetchPypi
}:

buildPythonPackage rec {
version = "1.0.1";
pname = "unittest-data-provider";

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

meta = with lib; {
description = "PHPUnit-like @dataprovider decorator for unittest";
homepage = https://github.com/yourlabs/unittest-data-provider;
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};
}
Loading