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

Commits on Nov 1, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cc476f0 View commit details
  2. incrtcl: add license

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    ba9d6b6 View commit details
  3. jama: add license

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    6afad9b View commit details
  4. jasper: add license

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    b13ab27 View commit details
  5. dbus-java: add license

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    08f4d75 View commit details
  6. gwt-dnd: add license

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    eea1946 View commit details
  7. gwt-widgets: add licenses

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    a923a5a View commit details
  8. hsqldb: add license

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    fe326f8 View commit details
  9. Copy the full SHA
    d356808 View commit details
  10. jdom: add meta data

    markuskowa committed Nov 1, 2018
    Copy the full SHA
    0d14037 View commit details
  11. Copy the full SHA
    4598cf4 View commit details
  12. Copy the full SHA
    5fabd1b View commit details
  13. Copy the full SHA
    645b5a0 View commit details
  14. Merge pull request #49614 from markuskowa/licenses-26

    Add licenses
    c0bw3b authored Nov 1, 2018
    Copy the full SHA
    87f97f0 View commit details
4 changes: 4 additions & 0 deletions lib/licenses.nix
Original file line number Diff line number Diff line change
@@ -400,6 +400,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};

jasper = spdx {
spdxId = "JasPer-2.0";
fullName = "JasPer License";
};

lgpl2 = spdx {
spdxId = "LGPL-2.0";
6 changes: 4 additions & 2 deletions pkgs/development/libraries/imlib/default.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,9 @@ stdenv.mkDerivation {

buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
description = "An image loading and rendering library for X11";
platforms = platforms.unix;
license = with licenses; [ gpl2 lgpl2 ];
};
}
7 changes: 4 additions & 3 deletions pkgs/development/libraries/incrtcl/default.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "incrtcl-${version}";
version = "4.0.4";

src = fetchurl {
url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz;
sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
libPrefix = "itcl3.4";
};

meta = {
meta = with stdenv.lib; {
homepage = http://incrtcl.sourceforge.net/;
description = "Object Oriented Enhancements for Tcl/Tk";
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
license = licenses.tcltk;
};
}
7 changes: 4 additions & 3 deletions pkgs/development/libraries/jama/default.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "jama-${version}";
version = "1.2.5";

src = fetchurl {
url = https://math.nist.gov/tnt/jama125.zip;
sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
cp *.h $out/include
'';

meta = {
meta = with stdenv.lib; {
homepage = https://math.nist.gov/tnt/;
description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
license = licenses.publicDomain;
};
}
1 change: 1 addition & 0 deletions pkgs/development/libraries/jasper/default.nix
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";
platforms = platforms.unix;
license = licenses.jasper;
maintainers = with maintainers; [ pSub ];
};
}
7 changes: 4 additions & 3 deletions pkgs/development/libraries/java/dbus-java/default.nix
Original file line number Diff line number Diff line change
@@ -18,8 +18,9 @@ stdenv.mkDerivation {
-e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
'';

meta = {
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.sander ];
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = [ maintainers.sander ];
license = licenses.afl21;
};
}
9 changes: 5 additions & 4 deletions pkgs/development/libraries/java/gwt-dragdrop/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,14 @@
stdenv.mkDerivation {
name = "gwt-dnd-2.6.5";
builder = ./builder.sh;

src = fetchurl {
url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar;
sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
};
};

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
platforms = platforms.unix;
license = licenses.asl20;
};
}
9 changes: 5 additions & 4 deletions pkgs/development/libraries/java/gwt-widgets/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,14 @@
stdenv.mkDerivation {
name = "gwt-widgets-0.2.0";
builder = ./builder.sh;

src = fetchurl {
url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
};
};

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
platforms = platforms.unix;
license = with licenses; [ afl21 lgpl2 ];
};
}
7 changes: 4 additions & 3 deletions pkgs/development/libraries/java/hsqldb/default.nix
Original file line number Diff line number Diff line change
@@ -12,8 +12,9 @@ stdenv.mkDerivation {

buildInputs = [ unzip
];

meta = {
platforms = stdenv.lib.platforms.unix;

meta = with stdenv.lib; {
platforms = platforms.unix;
license = licenses.bsd3;
};
}
6 changes: 4 additions & 2 deletions pkgs/development/libraries/java/httpunit/default.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,9 @@ stdenv.mkDerivation {

inherit unzip;

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
homepage = http://httpunit.sourceforge.net;
platforms = platforms.unix;
license = licenses.mit;
};
}
7 changes: 5 additions & 2 deletions pkgs/development/libraries/java/jdom/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,10 @@ stdenv.mkDerivation {
sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
};

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
homepage = http://www.jdom.org;
platforms = platforms.unix;
license = licenses.bsdOriginal;
};
}
7 changes: 4 additions & 3 deletions pkgs/development/libraries/java/libmatthew-java/default.nix
Original file line number Diff line number Diff line change
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
PREFIX=''''${out}'';
buildInputs = [ jdk ];

meta = {
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.sander ];
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = [ maintainers.sander ];
license = licenses.mit;
};
}
6 changes: 4 additions & 2 deletions pkgs/development/libraries/java/lucene/default.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
};

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
description = "Java full-text search engine";
platforms = platforms.unix;
license = licenses.asl20;
};
}
6 changes: 4 additions & 2 deletions pkgs/development/libraries/java/mockobjects/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
};

meta = {
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
description = "Generic unit testing framework and methodology for testing any kind of code";
platforms = platforms.unix;
license = licenses.asl20;
};
}