Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 904f14b2bee7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 793a2fe1e8bb
Choose a head ref
  • 2 commits
  • 24 files changed
  • 1 contributor

Commits on Oct 8, 2019

  1. Copy the full SHA
    1e9cc5b View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    793a2fe View commit details
Showing with 30 additions and 29 deletions.
  1. +0 −1 pkgs/applications/science/electronics/kicad/default.nix
  2. +0 −1 pkgs/desktops/plasma-5/kscreen.nix
  3. +0 −1 pkgs/development/libraries/qca2/default.nix
  4. +2 −1 pkgs/development/python-modules/bidict/default.nix
  5. +2 −2 pkgs/development/python-modules/django_taggit/default.nix
  6. +0 −1 pkgs/development/python-modules/filemagic/default.nix
  7. +2 −1 pkgs/development/python-modules/filterpy/default.nix
  8. +0 −1 pkgs/development/python-modules/flake8-future-import/default.nix
  9. +2 −1 pkgs/development/python-modules/gensim/default.nix
  10. +2 −1 pkgs/development/python-modules/minidb/default.nix
  11. +0 −1 pkgs/development/python-modules/openrazer/common.nix
  12. +3 −0 pkgs/development/python-modules/openrazer/daemon.nix
  13. +2 −2 pkgs/development/python-modules/piccata/default.nix
  14. +2 −2 pkgs/development/python-modules/ptpython/default.nix
  15. +2 −1 pkgs/development/python-modules/pykickstart/default.nix
  16. +2 −2 pkgs/development/python-modules/pytorch/default.nix
  17. +2 −2 pkgs/development/python-modules/rubymarshal/default.nix
  18. +2 −1 pkgs/development/python-modules/snug/default.nix
  19. +0 −1 pkgs/development/python-modules/sqlalchemy-migrate/default.nix
  20. +2 −1 pkgs/development/python-modules/ssdp/default.nix
  21. +1 −2 pkgs/development/python-modules/swagger-spec-validator/default.nix
  22. +0 −1 pkgs/development/python-modules/torchvision/default.nix
  23. +2 −1 pkgs/development/python-modules/yt/default.nix
  24. +0 −1 pkgs/tools/graphics/neural-style/default.nix
1 change: 0 additions & 1 deletion pkgs/applications/science/electronics/kicad/default.nix
Original file line number Diff line number Diff line change
@@ -116,6 +116,5 @@ in stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ berce ];
platforms = with platforms; linux;
broken = true;
};
}
1 change: 0 additions & 1 deletion pkgs/desktops/plasma-5/kscreen.nix
Original file line number Diff line number Diff line change
@@ -14,5 +14,4 @@ mkDerivation {
libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative
plasma-framework
];
meta.broken = true;
}
1 change: 0 additions & 1 deletion pkgs/development/libraries/qca2/default.nix
Original file line number Diff line number Diff line change
@@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
homepage = http://delta.affinix.com/qca;
maintainers = [ maintainers.sander ];
platforms = platforms.unix;
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/bidict/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,13 @@
, pytest-benchmark
, sortedcollections
, sortedcontainers
, isPy3k
}:

buildPythonPackage rec {
pname = "bidict";
version = "0.18.2";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -38,6 +40,5 @@ buildPythonPackage rec {
description = "Efficient, Pythonic bidirectional map data structures and related functionality";
license = licenses.mpl20;
maintainers = with maintainers; [ jakewaksbaum ];
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django_taggit/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,13 @@
, django
, mock
, isort
, isPy3k
}:

buildPythonPackage rec {
pname = "django-taggit";
version = "1.1.0";
disabled = pythonOlder "2.7";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -32,7 +33,6 @@ buildPythonPackage rec {
homepage = https://github.com/alex/django-taggit/tree/master/;
license = licenses.bsd2;
maintainers = with maintainers; [ desiderius ];
broken = true;
};

}
1 change: 0 additions & 1 deletion pkgs/development/python-modules/filemagic/default.nix
Original file line number Diff line number Diff line change
@@ -25,6 +25,5 @@ buildPythonPackage {
homepage = https://github.com/aliles/filemagic;
license = licenses.asl20;
maintainers = with maintainers; [ earvstedt ];
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/filterpy/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,13 @@
, scipy
, matplotlib
, pytest
, isPy3k
}:

buildPythonPackage rec {
version = "1.4.5";
pname = "filterpy";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -31,6 +33,5 @@ buildPythonPackage rec {
description = "Kalman filtering and optimal estimation library";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
broken = true;
};
}
Original file line number Diff line number Diff line change
@@ -26,6 +26,5 @@ buildPythonPackage rec {
homepage = https://github.com/xZise/flake8-future-import;
description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";
license = lib.licenses.mit;
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/gensim/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,13 @@
, scipy
, smart_open
, scikitlearn, testfixtures, unittest2
, isPy3k
}:

buildPythonPackage rec {
pname = "gensim";
version = "3.8.0";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -37,6 +39,5 @@ buildPythonPackage rec {
homepage = https://radimrehurek.com/gensim/;
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ jyp ];
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/minidb/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,13 @@
, buildPythonPackage
, fetchurl
, nose
, isPy3k
}:

buildPythonPackage rec {
pname = "minidb";
version = "2.0.2";
disabled = !isPy3k;

src = fetchurl {
url = "https://github.com/thp/minidb/archive/${version}.tar.gz";
@@ -24,7 +26,6 @@ buildPythonPackage rec {
homepage = https://thp.io/2010/minidb/;
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.tv ];
broken = true;
};

}
1 change: 0 additions & 1 deletion pkgs/development/python-modules/openrazer/common.nix
Original file line number Diff line number Diff line change
@@ -13,6 +13,5 @@
license = licenses.gpl2;
maintainers = with maintainers; [ roelvandijk ];
platforms = platforms.linux;
broken = true;
};
}
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/openrazer/daemon.nix
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
, setproctitle
, stdenv
, wrapGAppsHook
, isPy3k
}:

let
@@ -19,6 +20,8 @@ in
buildPythonApplication (common // rec {
pname = "openrazer_daemon";

disabled = !isPy3k;

sourceRoot = "source/daemon";

outputs = [ "out" "man" ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/piccata/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ buildPythonPackage, fetchPypi, lib, ipaddress }:
{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }:

buildPythonPackage rec {
pname = "piccata";
version = "1.0.1";
disabled = isPy3k;

src = fetchPypi {
inherit pname version;
@@ -15,6 +16,5 @@ buildPythonPackage rec {
description = "Simple CoAP (RFC7252) toolkit";
homepage = "https://github.com/NordicSemiconductor/piccata";
maintainers = with lib.maintainers; [ gebner ];
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ptpython/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }:
{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }:

buildPythonPackage rec {
pname = "ptpython";
version = "2.0.4";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -19,6 +20,5 @@ buildPythonPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ mlieberman85 ];
platforms = platforms.all;
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/pykickstart/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,14 @@
, fetchurl
, urlgrabber
, python
, isPy3k
}:

buildPythonPackage rec {
pname = "pykickstart";
version = "1.99.39";
md5_path = "d249f60aa89b1b4facd63f776925116d";
disabled = isPy3k;

src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
@@ -31,7 +33,6 @@ buildPythonPackage rec {
homepage = "http://fedoraproject.org/wiki/Pykickstart";
description = "Read and write Fedora kickstart files";
license = licenses.gpl2Plus;
broken = true;
};

}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pytorch/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
linkFarm, symlinkJoin,
utillinux, which }:
utillinux, which, isPy3k }:

assert cudnn == null || cudatoolkit != null;
assert !cudaSupport || cudatoolkit != null;
@@ -27,6 +27,7 @@ let
in buildPythonPackage rec {
version = "1.0.0";
pname = "pytorch";
disabled = !isPy3k;

src = fetchFromGitHub {
owner = "pytorch";
@@ -106,6 +107,5 @@ in buildPythonPackage rec {
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ teh thoughtpolice ];
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/rubymarshal/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi, hypothesis }:
{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:

buildPythonPackage rec {
pname = "rubymarshal";
version = "1.2.6";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -16,6 +17,5 @@ buildPythonPackage rec {
description = "Read and write Ruby-marshalled data";
license = licenses.wtfpl;
maintainers = [ maintainers.ryantm ];
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/snug/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{ buildPythonPackage, lib, fetchFromGitHub, glibcLocales
, pytest, pytest-mock, gentools
, typing, singledispatch, pythonOlder
, isPy3k
}:

buildPythonPackage rec {
pname = "snug";
version = "1.3.4";
disabled = isPy3k;

# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
@@ -32,7 +34,6 @@ buildPythonPackage rec {
license = licenses.mit;
homepage = https://snug.readthedocs.io/en/latest/;
maintainers = with maintainers; [ mredaelli ];
broken = true;
};

}
Original file line number Diff line number Diff line change
@@ -45,6 +45,5 @@ buildPythonPackage rec {
description = "Schema migration tools for SQLAlchemy";
license = licenses.asl20;
maintainers = with maintainers; [ makefu ];
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/ssdp/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,13 @@
, fetchPypi
, pbr
, pytest
, isPy3k
}:

buildPythonPackage rec {
pname = "ssdp";
version = "1.0.1";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
@@ -22,6 +24,5 @@ buildPythonPackage rec {
homepage = https://github.com/codingjoe/ssdp;
description = "Python asyncio library for Simple Service Discovery Protocol (SSDP).";
license = licenses.mit;
broken = true;
};
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }:
{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock, isPy3k }:

buildPythonPackage rec {
pname = "swagger-spec-validator";
@@ -31,7 +31,6 @@ buildPythonPackage rec {
license = licenses.asl20;
description = "Validation of Swagger specifications";
maintainers = with maintainers; [ vanschelven ];
broken = true;
};
}

1 change: 0 additions & 1 deletion pkgs/development/python-modules/torchvision/default.nix
Original file line number Diff line number Diff line change
@@ -26,6 +26,5 @@ buildPythonPackage rec {
homepage = https://pytorch.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ ericsagnes ];
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/yt/default.nix
Original file line number Diff line number Diff line change
@@ -10,11 +10,13 @@
, nose
, cython
, python
, isPy3k
}:

buildPythonPackage rec {
pname = "yt";
version = "3.5.1";
disabled = isPy3k;

src = fetchPypi {
inherit pname version;
@@ -48,6 +50,5 @@ buildPythonPackage rec {
homepage = https://github.com/yt-project/yt;
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
broken = true;
};
}
1 change: 0 additions & 1 deletion pkgs/tools/graphics/neural-style/default.nix
Original file line number Diff line number Diff line change
@@ -54,6 +54,5 @@ stdenv.mkDerivation rec {
maintainers = [stdenv.lib.maintainers.raskin];
# Eats a lot of RAM
platforms = ["x86_64-linux"];
broken = true;
};
}