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

Commits on Sep 8, 2018

  1. Copy the full SHA
    2ed07fd View commit details
  2. prooftree: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    258c202 View commit details
  3. pynac: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    1cff2dd View commit details
  4. root: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    70e254d View commit details
  5. bazaar: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    c2ff374 View commit details
  6. bzr-tools: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    499b7e8 View commit details
  7. cvs2svn: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    9f29e4c View commit details
  8. guitone: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    edb1bfc View commit details
  9. monotone: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    ae795a6 View commit details
  10. vcprompt: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    ffb5eca View commit details
  11. tivodecode: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    2be3ed4 View commit details
  12. xine-ui: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    6e6e41b View commit details
  13. fbpanel: add license

    markuskowa committed Sep 8, 2018
    Copy the full SHA
    d18bf12 View commit details
  14. Merge pull request #46366 from markuskowa/license-14

    Add licenses
    timokau authored Sep 8, 2018
    Copy the full SHA
    fc67c05 View commit details
6 changes: 4 additions & 2 deletions pkgs/applications/science/geometry/drgeo/default.nix
Original file line number Diff line number Diff line change
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
cp drgeo.desktop.in drgeo.desktop
'';

meta = {
meta = with stdenv.lib; {
description = "Interactive geometry program";
platforms = stdenv.lib.platforms.linux;
homepage = https://sourceforge.net/projects/ofset;
license = licenses.gpl2;
platforms = platforms.linux;
};
}
7 changes: 4 additions & 3 deletions pkgs/applications/science/logic/prooftree/default.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
dontAddPrefix = true;
configureFlags = [ "--prefix" "$(out)" ];

meta = {
meta = with stdenv.lib; {
description = "A program for proof-tree visualization";
longDescription = ''
Prooftree is a program for proof-tree visualization during interactive
@@ -35,7 +35,8 @@ stdenv.mkDerivation (rec {
shift-click).
'';
homepage = http://askra.de/software/prooftree;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.jwiegley ];
platforms = platforms.unix;
maintainers = [ maintainers.jwiegley ];
license = licenses.gpl3;
};
})
1 change: 1 addition & 0 deletions pkgs/applications/science/math/pynac/default.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
of the full GiNaC, and it is *only* meant to be used as a Python library.
'';
homepage = http://pynac.org;
license = licenses.gpl3;
maintainers = with maintainers; [ timokau ];
platforms = platforms.linux;
};
7 changes: 4 additions & 3 deletions pkgs/applications/science/misc/root/default.nix
Original file line number Diff line number Diff line change
@@ -67,10 +67,11 @@ stdenv.mkDerivation rec {

setupHook = ./setup-hook.sh;

meta = {
meta = with stdenv.lib; {
homepage = https://root.cern.ch/;
description = "A data analysis framework";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
platforms = platforms.unix;
maintainers = [ maintainers.veprbl ];
license = licenses.lgpl21;
};
}
5 changes: 3 additions & 2 deletions pkgs/applications/version-management/bazaar/default.nix
Original file line number Diff line number Diff line change
@@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec {
--subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
'';

meta = {
meta = with stdenv.lib; {
homepage = http://bazaar-vcs.org/;
description = "A distributed version control system that Just Works";
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
license = licenses.gpl2Plus;
};
}
7 changes: 4 additions & 3 deletions pkgs/applications/version-management/bazaar/tools.nix
Original file line number Diff line number Diff line change
@@ -3,17 +3,18 @@
python2Packages.buildPythonApplication rec {
name = "bzr-tools-${version}";
version = "2.6.0";

src = fetchurl {
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
};

doCheck = false;

meta = {
meta = with stdenv.lib; {
description = "Bazaar plugins";
homepage = http://wiki.bazaar.canonical.com/BzrTools;
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
license = licenses.gpl2;
};
}
7 changes: 4 additions & 3 deletions pkgs/applications/version-management/cvs2svn/default.nix
Original file line number Diff line number Diff line change
@@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
/* !!! maybe we should absolutise the program names in
$out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */

meta = {
meta = with stdenv.lib; {
description = "A tool to convert CVS repositories to Subversion repositories";
homepage = http://cvs2svn.tigris.org/;
maintainers = [ lib.maintainers.makefu ];
platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.makefu ];
platforms = platforms.unix;
license = licenses.asl20;
};
}
3 changes: 2 additions & 1 deletion pkgs/applications/version-management/guitone/default.nix
Original file line number Diff line number Diff line change
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {

meta = {
description = "Qt4 based GUI for monotone";
homepage = http://guitone.thomaskeller.biz;
homepage = https://guitone.thomaskeller.biz;
downloadPage = https://code.monotone.ca/p/guitone/;
license = stdenv.lib.licenses.gpl3;
inherit (qt4.meta) platforms;
};
}
9 changes: 5 additions & 4 deletions pkgs/applications/version-management/monotone/default.nix
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
openssl gmp bzip2 ];

postInstall = ''
@@ -33,9 +33,10 @@ stdenv.mkDerivation rec {

#doCheck = true; # some tests fail (and they take VERY long)

meta = {
meta = with stdenv.lib; {
description = "A free distributed version control system";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.raskin ];
platforms = platforms.unix;
license = licenses.gpl2;
};
}
1 change: 1 addition & 0 deletions pkgs/applications/version-management/vcprompt/default.nix
Original file line number Diff line number Diff line change
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
homepage = http://hg.gerg.ca/vcprompt;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux ++ darwin;
license = licenses.gpl2Plus;
};
}
5 changes: 3 additions & 2 deletions pkgs/applications/video/tivodecode/default.nix
Original file line number Diff line number Diff line change
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q";
};

meta = {
meta = with stdenv.lib; {
description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
homepage = http://tivodecode.sourceforge.net;
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
license = licenses.bsd3;
};
}
11 changes: 6 additions & 5 deletions pkgs/applications/video/xine-ui/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

stdenv.mkDerivation rec {
name = "xine-ui-0.99.10";

src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
};

nativeBuildInputs = [ pkgconfig shared-mime-info ];

buildInputs =
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';

configureFlags = [ "--with-readline=${readline.dev}" ];

LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client";
#NIX_LDFLAGS = "-lXext -lgcc_s";

meta = {
meta = with stdenv.lib; {
homepage = http://www.xine-project.org/;
description = "Xlib-based interface to Xine, a video player";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
license = licenses.gpl2;
};
}
1 change: 1 addition & 0 deletions pkgs/applications/window-managers/fbpanel/default.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
description = "A stand-alone panel";
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.mit;
};

passthru = {