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: cefceb4d88d3
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: 2200a805f2eb
Choose a head ref

Commits on Nov 7, 2018

  1. oidentd: 2.2.2 -> 2.3.1

    * Added license: GPLv2.
    * Updated homepage and description.
    * CFLAGS are no longer necessary as of version 2.2.0.
    * Option '-a ::' is no longer necessary as of version 2.2.0.
    janikrabe committed Nov 7, 2018
    Copy the full SHA
    49e97f8 View commit details

Commits on Nov 18, 2018

  1. gitAndTools.stgit: 0.18 -> 0.19

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/stgit/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    d910d38 View commit details
  2. Copy the full SHA
    50aef60 View commit details
  3. python36Packages.uproot: 3.2.6 -> 3.2.12

    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.6-uproot/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    4b7a7d9 View commit details
  4. python36Packages.uproot-methods: 0.2.6 -> 0.2.7

    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.6-uproot-methods/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    360c465 View commit details
  5. python36Packages.uranium: 3.4.1 -> 3.5.1

    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.6-uranium/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    e96cce6 View commit details
  6. python36Packages.transaction: 2.3.0 -> 2.4.0

    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.6-transaction/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    536b4e8 View commit details
  7. python36Packages.sseclient: 0.0.19 -> 0.0.20

    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.6-sseclient/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    b8e006b View commit details
  8. python36Packages.phonenumbers: 8.9.16 -> 8.10.0

    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.6-phonenumbers/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    4122f42 View commit details
  9. python36Packages.redis: 2.10.6 -> 3.0.1

    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.6-redis/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    094e643 View commit details
  10. python36Packages.pytest-django: 3.4.3 -> 3.4.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.6-pytest-django/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    0d0f900 View commit details
  11. python36Packages.pyhomematic: 0.1.50 -> 0.1.51

    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.6-pyhomematic/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    7eff6a8 View commit details
  12. python36Packages.pytest-timeout: 1.3.2 -> 1.3.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.6-pytest-timeout/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    a58f001 View commit details
  13. linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12

    Robert Schütz committed Nov 18, 2018
    Copy the full SHA
    d9cd9ac View commit details
  14. python36Packages.django_nose: 1.4.5 -> 1.4.6

    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.6-django-nose/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    fd9a491 View commit details
  15. python36Packages.jsonref: 0.1 -> 0.2

    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.6-jsonref/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    0509b86 View commit details
  16. Merge pull request #50619 from r-ryantm/auto-update/python3.6-django-…

    …nose
    
    python36Packages.django_nose: 1.4.5 -> 1.4.6
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3dcecb3 View commit details
  17. terminus_font_ttf: 4.40.1 -> 4.46.0

    * terminus_font_ttf: 4.40.1 -> 4.46.0 (#50616)
    
    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/terminus-font-ttf/versions
    
    * terminus-font-ttf: fix hash
    r-ryantm authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    5b018a8 View commit details
  18. Merge pull request #50588 from r-ryantm/auto-update/python3.6-phonenu…

    …mbers
    
    python36Packages.phonenumbers: 8.9.16 -> 8.10.0
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    faa279d View commit details
  19. Merge pull request #50598 from r-ryantm/auto-update/python3.6-pytest-…

    …django
    
    python36Packages.pytest-django: 3.4.3 -> 3.4.4
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6788fd7 View commit details
  20. Merge pull request #50584 from r-ryantm/auto-update/python3.6-uranium

    python36Packages.uranium: 3.4.1 -> 3.5.1
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c2d86df View commit details
  21. Merge pull request #50587 from r-ryantm/auto-update/python3.6-sseclient

    python36Packages.sseclient: 0.0.19 -> 0.0.20
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    80ddfb6 View commit details
  22. python36Packages.elpy: 1.25.0 -> 1.26.0

    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.6-elpy/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    3bc890f View commit details
  23. python36Packages.qtconsole: 4.4.2 -> 4.4.3

    * python36Packages.qtconsole: 4.4.2 -> 4.4.3 (#50590)
    
    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.6-qtconsole/versions
    
    * pythonPackages.qtconsole: linux platforms only
    r-ryantm authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    d7ef9a7 View commit details
  24. eigen3_3: fix EIGEN3_INCLUDE_DIR location (#50628)

    Eigen assumes that CMAKE_INSTALL_INCLUDEDIR is a path relative to
    CMAKE_INSTALL_PREFIX (typically "include"), but CMake supports it being an
    absolute path, which is the case in Nixpkgs. This resulted in EIGEN3_INCLUDE_DIR
    being set to "/nix/store/…eigen…//nix/store/…eigen…/include/eigen3".
    
    GNUInstallDirs_get_absolute_install_dir requires CMake 3.7.
    orivej authored and orivej-nixos committed Nov 18, 2018
    Copy the full SHA
    023e544 View commit details
  25. python36Packages.flask-cors: 3.0.6 -> 3.0.7

    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.6-flask-cors/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    f472264 View commit details
  26. morph: init at 1.1.0

    - added adamt to maintainers-list.nix
    Johan Thomsen committed Nov 18, 2018
    Copy the full SHA
    46b11c9 View commit details
  27. python36Packages.Nuitka: 0.6.0.4 -> 0.6.0.6

    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.6-nuitka/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    8fceacc View commit details
  28. Merge pull request #50630 from johanot/morph-init

    morph: init at 1.1.0
    ryantm authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1662699 View commit details
  29. python36Packages.distributed: 1.24.0 -> 1.24.1

    * python36Packages.distributed: 1.24.0 -> 1.24.1 (#50621)
    
    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.6-distributed/versions
    
    * distributed: build for x86 only
    
    x64-darwin + x64-linux
    r-ryantm authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    151cc7c View commit details
  30. python36Packages.confluent-kafka: 0.11.5 -> 0.11.6

    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.6-confluent-kafka/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    a485643 View commit details
  31. Merge pull request #50633 from r-ryantm/auto-update/python3.6-Nuitka

    python36Packages.Nuitka: 0.6.0.4 -> 0.6.0.6
    Mic92 authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1e18cd5 View commit details
  32. Merge pull request #50627 from r-ryantm/auto-update/python3.6-elpy

    python36Packages.elpy: 1.25.0 -> 1.26.0
    Mic92 authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c1c4660 View commit details
  33. Merge pull request #50586 from r-ryantm/auto-update/python3.6-transac…

    …tion
    
    python36Packages.transaction: 2.3.0 -> 2.4.0
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a0758c8 View commit details
  34. Merge pull request #50600 from r-ryantm/auto-update/python3.6-pyhomem…

    …atic
    
    python36Packages.pyhomematic: 0.1.50 -> 0.1.51
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1145aa8 View commit details
  35. Merge pull request #50601 from r-ryantm/auto-update/python3.6-pytest-…

    …timeout
    
    python36Packages.pytest-timeout: 1.3.2 -> 1.3.3
    Mic92 authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bf41830 View commit details
  36. Merge pull request #50578 from r-ryantm/auto-update/python3.6-uproot

    python36Packages.uproot: 3.2.6 -> 3.2.12
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    29fa506 View commit details
  37. Merge pull request #50582 from r-ryantm/auto-update/python3.6-uproot-…

    …methods
    
    python36Packages.uproot-methods: 0.2.6 -> 0.2.7
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a493b60 View commit details
  38. python36Packages.qtawesome: 0.5.1 -> 0.5.2

    * python36Packages.qtawesome: 0.5.1 -> 0.5.2 (#50603)
    
    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.6-qtawesome/versions
    
    *  pythonPackages.qtawesome: linux platforms only
    r-ryantm authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    c8eaf88 View commit details
  39. Merge pull request #50541 from r-ryantm/auto-update/stgit

    gitAndTools.stgit: 0.18 -> 0.19
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ee32dda View commit details
  40. python36Packages.google_api_core: 1.5.0 -> 1.5.2

    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.6-google-api-core/versions
    r-ryantm committed Nov 18, 2018
    Copy the full SHA
    39b0773 View commit details
  41. xosview2: 2.2.2 -> 2.3.0

    * xosview2: 2.2.2 -> 2.3.0  (#50533)
    
    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xosview2/versions
    
    * xosview2: fix licenses
    https://sourceforge.net/p/xosview/git/ci/v2.3.0/tree/COPYING
    r-ryantm authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    4b55459 View commit details
  42. Merge pull request #50589 from r-ryantm/auto-update/python3.6-redis

    python36Packages.redis: 2.10.6 -> 3.0.1
    Mic92 authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f26b325 View commit details
  43. Merge pull request #49631 from janikrabe/master

    oidentd: 2.2.2 -> 2.3.1
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7f84561 View commit details
  44. Merge pull request #50640 from r-ryantm/auto-update/python3.6-google-…

    …api-core
    
    python36Packages.google_api_core: 1.5.0 -> 1.5.2
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    98cf5f4 View commit details
  45. Merge pull request #50635 from r-ryantm/auto-update/python3.6-conflue…

    …nt-kafka
    
    python36Packages.confluent-kafka: 0.11.5 -> 0.11.6
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    487235e View commit details
  46. git-latexdiff: 1.1.2 -> 1.3.0

    * git-latexdiff: v1.1.2 -> v1.3.0  (#50217)
    
    * git-latexdiff: refresh meta
    Homepage is https://gitlab.com/git-latexdiff/git-latexdiff
    License is BSD 3-Clause
    qfjp authored and c0bw3b committed Nov 18, 2018
    Copy the full SHA
    a6ddb1f View commit details
  47. Merge pull request #50632 from r-ryantm/auto-update/python3.6-Flask-Cors

    python36Packages.flask-cors: 3.0.6 -> 3.0.7
    c0bw3b authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5f80e41 View commit details

Commits on Nov 19, 2018

  1. Merge pull request #50622 from r-ryantm/auto-update/python3.6-jsonref

    python36Packages.jsonref: 0.1 -> 0.2
    c0bw3b authored Nov 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7f1943b View commit details
  2. protozero: 1.6.3 -> 1.6.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/protozero/versions
    r-ryantm committed Nov 19, 2018
    Copy the full SHA
    513315a View commit details
Showing with 394 additions and 217 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +1 −2 nixos/modules/services/networking/oidentd.nix
  3. +2 −2 pkgs/applications/audio/pulseeffects/default.nix
  4. +2 −2 pkgs/applications/version-management/git-and-tools/stgit/default.nix
  5. +2 −2 pkgs/data/fonts/terminus-font-ttf/default.nix
  6. +7 −4 pkgs/development/coq-modules/bignums/default.nix
  7. +2 −2 pkgs/development/interpreters/jruby/default.nix
  8. +5 −5 pkgs/development/libraries/eigen/3.3.nix
  9. +49 −0 pkgs/development/libraries/eigen/include-dir.patch
  10. +16 −6 pkgs/development/libraries/java/jflex/default.nix
  11. +7 −5 pkgs/development/libraries/movit/default.nix
  12. +2 −2 pkgs/development/libraries/ntl/default.nix
  13. +2 −2 pkgs/development/libraries/protozero/default.nix
  14. +2 −2 pkgs/development/python-modules/confluent-kafka/default.nix
  15. +3 −2 pkgs/development/python-modules/distributed/default.nix
  16. +2 −2 pkgs/development/python-modules/django_nose/default.nix
  17. +2 −2 pkgs/development/python-modules/elpy/default.nix
  18. +2 −2 pkgs/development/python-modules/flask-cors/default.nix
  19. +2 −2 pkgs/development/python-modules/google_api_core/default.nix
  20. +2 −2 pkgs/development/python-modules/jsonref/default.nix
  21. +2 −2 pkgs/development/python-modules/nuitka/default.nix
  22. +2 −2 pkgs/development/python-modules/phonenumbers/default.nix
  23. +2 −2 pkgs/development/python-modules/pyhomematic/default.nix
  24. +2 −2 pkgs/development/python-modules/pytest-django/default.nix
  25. +2 −2 pkgs/development/python-modules/pytest-timeout/default.nix
  26. +3 −2 pkgs/development/python-modules/qtawesome/default.nix
  27. +3 −2 pkgs/development/python-modules/qtconsole/default.nix
  28. +2 −2 pkgs/development/python-modules/redis/default.nix
  29. +2 −2 pkgs/development/python-modules/sseclient/default.nix
  30. +2 −2 pkgs/development/python-modules/transaction/default.nix
  31. +2 −2 pkgs/development/python-modules/uproot-methods/default.nix
  32. +2 −2 pkgs/development/python-modules/uproot/default.nix
  33. +2 −2 pkgs/development/python-modules/uranium/default.nix
  34. +25 −0 pkgs/development/tools/jid/default.nix
  35. +57 −0 pkgs/development/tools/jid/deps.nix
  36. +2 −2 pkgs/os-specific/linux/spl/default.nix
  37. +3 −3 pkgs/os-specific/linux/zfs/default.nix
  38. +10 −10 pkgs/servers/identd/oidentd/default.nix
  39. +2 −2 pkgs/servers/nosql/neo4j/default.nix
  40. +3 −3 pkgs/tools/X11/xosview2/default.nix
  41. +4 −3 pkgs/tools/filesystems/mtools/default.nix
  42. +11 −0 pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
  43. +7 −7 pkgs/tools/networking/curl/7_59.nix
  44. +7 −7 pkgs/tools/networking/curl/default.nix
  45. +37 −0 pkgs/tools/package-management/morph/default.nix
  46. +66 −0 pkgs/tools/package-management/morph/deps.nix
  47. +6 −4 pkgs/tools/typesetting/git-latexdiff/default.nix
  48. +0 −10 pkgs/tools/typesetting/git-latexdiff/shebang.patch
  49. +3 −3 pkgs/tools/typesetting/git-latexdiff/version-test.patch
  50. +2 −4 pkgs/tools/typesetting/scdoc/default.nix
  51. +0 −75 pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch
  52. +4 −10 pkgs/top-level/all-packages.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -73,6 +73,11 @@
github = "acowley";
name = "Anthony Cowley";
};
adamt = {
email = "mail@adamtulinius.dk";
github = "adamtulinius";
name = "Adam Tulinius";
};
adelbertc = {
email = "adelbertc@gmail.com";
github = "adelbertc";
3 changes: 1 addition & 2 deletions nixos/modules/services/networking/oidentd.nix
Original file line number Diff line number Diff line change
@@ -28,8 +28,7 @@ with lib;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "forking";
script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" +
optionalString config.networking.enableIPv6 " -a ::";
script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
};

users.users.oidentd = {
4 changes: 2 additions & 2 deletions pkgs/applications/audio/pulseeffects/default.nix
Original file line number Diff line number Diff line change
@@ -44,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
version = "4.3.9";
version = "4.4.0";

src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6";
sha256 = "0bjzlqyvcp9hxaq07nqr14k9kvan5myaxb7ci30gz0fgayib85lv";
};

nativeBuildInputs = [
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
name = "stgit-${version}";
version = "0.18";
version = "0.19";
in
stdenv.mkDerivation {
inherit name;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "ctmarinas";
repo = "stgit";
rev = "v${version}";
sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y";
sha256 = "1dzl6cnyzwbzysp82x7w1yc03g25kwan3h0zpnzhhfhg6c904sis";
};

buildInputs = [ python2 git ];
4 changes: 2 additions & 2 deletions pkgs/data/fonts/terminus-font-ttf/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:

let
version = "4.40.1";
version = "4.46.0";
in fetchzip rec {
name = "terminus-font-ttf-${version}";

@@ -18,7 +18,7 @@ in fetchzip rec {
install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING"
'';

sha256 = "0cfkpgixdz47y94s9j26pm7n4hvad23vb2q4315kgahl4294zcpg";
sha256 = "129rfmwnm2bhp99w4zl262l6sdx8pddc0gf1ispjqs6dz3m3mdkp";

meta = with stdenv.lib; {
description = "A clean fixed width TTF font";
11 changes: 7 additions & 4 deletions pkgs/development/coq-modules/bignums/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{ stdenv, fetchFromGitHub, coq }:

let params =
let v_8_8_0 = {
rev = "V8.8.0";
sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
};
in
{
"8.6" = {
rev = "v8.6.0";
@@ -10,10 +15,8 @@ let params =
rev = "V8.7.0";
sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
};
"8.8" = {
rev = "V8.8+beta1";
sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
};
"8.8" = v_8_8_0;
"8.9" = v_8_8_0;
};
param = params."${coq.coq-version}"
; in
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/jruby/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
name = "jruby-${version}";

version = "9.2.1.0";
version = "9.2.4.0";

src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "0d98ydiavdr811xsrz9zbw9yjpn0acc2ycakqpfg1vs4n5w7764c";
sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr";
};

buildInputs = [ makeWrapper ];
10 changes: 5 additions & 5 deletions pkgs/development/libraries/eigen/3.3.nix
Original file line number Diff line number Diff line change
@@ -5,19 +5,19 @@ let
in
stdenv.mkDerivation {
name = "eigen-${version}";

src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
};

patches = [
./include-dir.patch
];

nativeBuildInputs = [ cmake ];

postInstall = ''
sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
'';

meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
49 changes: 49 additions & 0 deletions pkgs/development/libraries/eigen/include-dir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
project(Eigen3)

-cmake_minimum_required(VERSION 2.8.5)
+cmake_minimum_required(VERSION 3.7)

# guard against in-source builds

@@ -408,13 +408,6 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)

-if(EIGEN_BUILD_PKGCONFIG)
- configure_file(eigen3.pc.in eigen3.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
- DESTINATION ${PKGCONFIG_INSTALL_DIR}
- )
-endif()
-
add_subdirectory(Eigen)

add_subdirectory(doc EXCLUDE_FROM_ALL)
@@ -510,8 +503,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} )
set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} )
set ( EIGEN_DEFINITIONS "")
-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR)
+
+if(EIGEN_BUILD_PKGCONFIG)
+ configure_file(eigen3.pc.in eigen3.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
+ DESTINATION ${PKGCONFIG_INSTALL_DIR}
+ )
+endif()

# Interface libraries require at least CMake 3.0
if (NOT CMAKE_VERSION VERSION_LESS 3.0)
--- a/eigen3.pc.in
+++ b/eigen3.pc.in
@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r
Requires:
Version: @EIGEN_VERSION_NUMBER@
Libs:
-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
+Cflags: -I@EIGEN_INCLUDE_DIR@
22 changes: 16 additions & 6 deletions pkgs/development/libraries/java/jflex/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
{stdenv, fetchurl} :
{stdenv, fetchurl, jre} :

stdenv.mkDerivation rec {
name = "jflex-1.6.1";
name = "jflex-1.7.0";

src = fetchurl {
url = "http://jflex.de/${name}.tar.gz";
sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq";
url = "http://jflex.de/release/${name}.tar.gz";
sha256 = "1k7bqw1mn569g9dxc0ia3yz1bzgzs5w52lh1xn3hgj7k5ymh54kk";
};

sourceRoot = name;

phases = [ "unpackPhase" "installPhase" ];

installPhase = ''
runHook preInstall
mkdir -p $out
cp -a * $out
rm -f $out/bin/jflex.bat
patchShebangs $out
sed -i -e '/^JAVA=java/ s#java#${jre}/bin/java#' $out/bin/jflex
runHook postInstall
'';

doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/jflex --version
runHook postInstallCheck
'';

meta = {
12 changes: 7 additions & 5 deletions pkgs/development/libraries/movit/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }:
{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:

stdenv.mkDerivation rec {
name = "movit-${version}";
version = "1.5.1";
version = "1.6.2";

src = fetchurl {
url = "https://movit.sesse.net/${name}.tar.gz";
sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l";
};

outputs = [ "out" "dev" ];

GTEST_DIR = "${gtest}";
GTEST_DIR = "${gtest.src}/googletest";

propagatedBuildInputs = [ eigen epoxy ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL fftw gtest ];
buildInputs = [ SDL2 fftw gtest ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "High-performance, high-quality video filters for the GPU";
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ntl/default.nix
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;

stdenv.mkDerivation rec {
name = "ntl-${version}";
version = "11.3.1";
version = "11.3.2";

src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
sha256 = "08a1v92js13ij6lpf75xkjc8iy2w89igd7hy58abll6wnjj107zs";
sha256 = "17bfsvn72zjqfibnxscyf4hbk3inndh4r89jd2zg7mgqmd2k3fl4";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/protozero/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "protozero-${version}";
version = "1.6.3";
version = "1.6.4";

src = fetchFromGitHub {
owner = "mapbox";
repo = "protozero";
rev = "v${version}";
sha256 = "0lalk6hp7hqfn4fhhl2zb214idwm4y8dj32vi383arckzmsryhiw";
sha256 = "0hcawgyj3wxqikx5xqs1ag12w8vz00gb1rzx131jq51yhzc6bwrb";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/confluent-kafka/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}:

buildPythonPackage rec {
version = "0.11.5";
version = "0.11.6";
pname = "confluent-kafka";

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

buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ;
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/distributed/default.nix
Original file line number Diff line number Diff line change
@@ -26,12 +26,12 @@

buildPythonPackage rec {
pname = "distributed";
version = "1.24.0";
version = "1.24.1";

# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
sha256 = "1a1wynxzs9i2mdz50fs23r9223fmkpwwr0kprqjyb31ladkk07c4";
sha256 = "13qch8wgjzx9zadaxasym3bp3a74bg5snhnbznpggssv3hyshca7";
};

checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
@@ -55,6 +55,7 @@ buildPythonPackage rec {
description = "Distributed computation in Python.";
homepage = http://distributed.readthedocs.io/en/latest/;
license = lib.licenses.bsd3;
platforms = lib.platforms.x86; # fails on aarch64
maintainers = with lib.maintainers; [ teh costrouc ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django_nose/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@

buildPythonPackage rec {
pname = "django-nose";
version = "1.4.5";
version = "1.4.6";

src = fetchPypi {
inherit pname version;
sha256 = "0sp78839s8yba6vlj9ab4r364skf1s5gzhaar1b1vw15rcc3yrl7";
sha256 = "01wah0ci5xdpiikash68x6lprxlvnkxg72ly9kjrc9lklq34m4sq";
};

# vast dependency list
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/elpy/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@

buildPythonPackage rec {
pname = "elpy";
version = "1.25.0";
version = "1.26.0";

src = fetchPypi {
inherit pname version;
sha256 = "10n20lw7n728ahnfrx03vgx9zim7jb8s1zqhw8yivksm9c1a6i12";
sha256 = "1m3dk609sn1j8zk8xwrlgcw82vkpws4q4aypv2ljpky9lm36npv6";
};

propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/flask-cors/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "Flask-Cors";
version = "3.0.6";
version = "3.0.7";

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

buildInputs = [ nose ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/google_api_core/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "google-api-core";
version = "1.5.0";
version = "1.5.2";

src = fetchPypi {
inherit pname version;
sha256 = "16ximavy7zgg0427790fmyma03xnkywar9krp4lx6bcphvyiahh3";
sha256 = "16knimv41rjhrqkibm1p8f5ssmbbcjn7njc71lpr8v03l7mr6f9q";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jsonref/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "jsonref";
version = "0.1";
version = "0.2";

src = fetchPypi {
inherit pname version;
sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n";
sha256 = "15v69rg2lkcykb2spnq6vbbirv9sfq480fnwmfppw9gn3h95pi7k";
};

buildInputs = [ pytest mock ];
Loading