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

Commits on May 30, 2017

  1. ditaa: more general platform

    @vbgl
    vbgl committed May 30, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a987943 View commit details

  2. unison: more general platform

    @vbgl
    vbgl committed May 30, 2017
    Copy the full SHA
    4f6422b View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/applications/networking/sync/unison/default.nix
  2. +1 −1 pkgs/tools/graphics/ditaa/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/networking/sync/unison/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ stdenv.mkDerivation (rec {
description = "Bidirectional file synchronizer";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; unix;
};

})
2 changes: 1 addition & 1 deletion pkgs/tools/graphics/ditaa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Convert ascii art diagrams into proper bitmap graphics";
homepage = http://ditaa.sourceforge.net/;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}