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: afec912d81e0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eda502d143f2
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on May 17, 2017

  1. icdiff: 1.7.3 -> 1.9.0 

    Also move to all-packages.nix,
because it is an application and not a library.
    @aneeshusa
    aneeshusa committed May 17, 2017

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    e75297a View commit details

Commits on May 18, 2017

  1. Merge pull request #25847 from aneeshusa/update-icdiff-to-1.9.0 

    icdiff: 1.7.3 -> 1.9.0
    @Mic92
    Mic92 authored May 18, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    GPG key ID: 22CBF5249D4B4D59
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eda502d View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/tools/text/icdiff/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
  3. +0 −2 pkgs/top-level/python-packages.nix
8 changes: 4 additions & 4 deletions pkgs/tools/text/icdiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, buildPythonApplication }:
{ stdenv, fetchFromGitHub, pythonPackages }:

buildPythonApplication rec {
pythonPackages.buildPythonApplication rec {
name = "icdiff-${version}";
version = "1.7.3";
version = "1.9.0";

src = fetchFromGitHub {
owner = "jeffkaufman";
repo = "icdiff";
rev = "release-${version}";
sha256 = "1k7dlf2i40flsrvkma1k1vii9hsjwdmwryx65q0n0yj4frv7ky6k";
sha256 = "03gcgj3xsqasvgkr8r0q1ljbw2kd2xmfb21qpxhk9lqqm2gl11sv";
};

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -996,6 +996,8 @@ with pkgs;

hr = callPackage ../applications/misc/hr { };

icdiff = callPackage ../tools/text/icdiff {};

interlock = callPackage ../servers/interlock {};

jbuilder = callPackage ../development/tools/ocaml/jbuilder { };
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -12616,8 +12616,6 @@ in {
};
};

icdiff = callPackage ../tools/text/icdiff {};

imageio = buildPythonPackage rec {
name = "imageio-${version}";
version = "1.6";