diff options
author | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
commit | 2d326e5032fda2210ff84118a526195f0a68bd24 (patch) | |
tree | d3af676b9948c865f1e942e1db51862da5e19ad5 /pkgs/applications/version-management | |
parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
download | nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.gz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.bz2 nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.lz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.xz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.zst nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.zip |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'pkgs/applications/version-management')
10 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 1be797fea96..9bc4401e068 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = http://www.cobite.com/cvsps/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index d92b49b9ef6..a7e6a62ce5f 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-2.5"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; description = "Graphical front-end to Git"; inherit (qt.meta) platforms; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix index c3b3469ca1a..590e090de48 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-git"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; }; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 5290a12a54a..195f6f3a463 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/greenrd/topgit"; description = "TopGit manages large amount of interdependent topic branches"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ]; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 73b21728e16..29094f1efce 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meld.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5fdafe8ac2a..fb3e115e125 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "http://www.selenic.com/mercurial/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index e89cea6aadc..29fafc4db74 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { offline, so they can be retried when it comes back online. ''; homepage = http://joeyh.name/code/mr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 264340b4826..843fe9ad323 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 90bca9b0712..e71d23132ac 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ eelco simons ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 569c442f983..b3bfe8a22e6 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation meta = { homepage = http://www.twobarleycorns.net/tkcvs.html; description = "TCL/TK GUI for cvs and subversion"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } |