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: 664bbed4122e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03f6edf75009
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Jul 27, 2017

  1. python-PyICU: 1.9.6 -> 1.9.7

    rycee committed Jul 27, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    19425c7 View commit details
  2. mimeo: 2017.2.9 -> 2017.6.6

    rycee committed Jul 27, 2017
    Copy the full SHA
    78815d0 View commit details
  3. Copy the full SHA
    fc75595 View commit details
  4. josm: 12275 -> 12450

    rycee committed Jul 27, 2017
    Copy the full SHA
    dd10801 View commit details
  5. Copy the full SHA
    03f6edf View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/editors/eclipse/plugins.nix
Original file line number Diff line number Diff line change
@@ -106,16 +106,16 @@ rec {

anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
version = "2.6.0.201511291145";
version = "2.7.0.201705171641";

srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b";
sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
};

srcPlugin = fetchurl {
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4";
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
};

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/applications/misc/josm/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "josm-${version}";
version = "12275";
version = "12450";

src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j";
};

phases = [ "installPhase" ];
1 change: 0 additions & 1 deletion pkgs/tools/graphics/gmic/default.nix
Original file line number Diff line number Diff line change
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
description = "G'MIC is an open and full-featured framework for image processing";
homepage = http://gmic.eu/;
license = licenses.cecill20;
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/misc/mimeo/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python3Packages.buildPythonApplication rec {
name = "mimeo-${version}";
version = "2017.2.9";
version = "2017.6.6";

src = fetchurl {
url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
sha256 = "1xbhz08aanix4bibz5jla58cmi6rnf946pf64wb0ka3s8jx0l5a0";
sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z";
};

buildInputs = [ file desktop_file_utils ];
8 changes: 5 additions & 3 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -18810,14 +18810,16 @@ in {
};

PyICU = buildPythonPackage rec {
name = "PyICU-1.9.6";
name = "PyICU-1.9.7";

src = pkgs.fetchurl {
url = "mirror://pypi/P/PyICU/${name}.tar.gz";
sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5";
sha256 = "0qavhngmn7c90fz25a8a2k50wd5gzp3vwwjq8v2pkf2hq4fcs9yv";
};

buildInputs = [ pkgs.icu ];
buildInputs = [ pkgs.icu self.pytest ];

propagatedBuildInputs = [ self.six ];

meta = {
homepage = https://pypi.python.org/pypi/PyICU/;