From f16124d52147402d227af776d9ceb727e35564a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 5 Jul 2014 17:29:21 +0200 Subject: [PATCH 001/286] Adds merlin Merlin is an editor-independant tool to ease the developpement of programs in OCaml. It aims to provide features available in modern IDEs. Homepage: http://the-lambda-church.github.io/merlin/ --- .../tools/ocaml/merlin/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/ocaml/merlin/default.nix diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix new file mode 100644 index 000000000000..a5a06f37c9c1 --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: +let + pname = "merlin"; + version = "1.6"; + webpage = "http://the-lambda-church.github.io/merlin/"; +in +stdenv.mkDerivation { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/the-lambda-church/${pname}/archive/v${version}.tar.gz"; + sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; + }; + + buildInputs = [ ocaml findlib biniou yojson menhir easy-format ]; + + prefixKey = "--prefix "; + + meta = { + description = "An editor-independant tool to ease the developpement of programs in OCaml"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.mit; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6535fea8162..c84af828153c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3217,6 +3217,8 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + merlin = callPackage ../development/tools/ocaml/merlin { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; From 4b1b861983b59eecbf7ba170aaaa0c84c2522e0e Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 15 Jul 2014 11:32:23 -0700 Subject: [PATCH 002/286] SDL_mixer : add option to enable FluidSynth for playing MIDIs with SF2s --- pkgs/development/libraries/SDL_mixer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index f5b40daaf68c..82d0821667d8 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis]; + buildInputs = [SDL libogg libvorbis fluidsynth]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl"; + configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/"; From 7c84e3b785c2a512af1e2c185a5d830df56876b0 Mon Sep 17 00:00:00 2001 From: Andrew Morsillo Date: Wed, 23 Jul 2014 22:41:30 -0400 Subject: [PATCH 003/286] Add dwarf fortress 2014 (unstable) version --- pkgs/games/dwarf-fortress/df2014.nix | 82 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++++ 2 files changed, 92 insertions(+) create mode 100644 pkgs/games/dwarf-fortress/df2014.nix diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix new file mode 100644 index 000000000000..aecdb0a44e13 --- /dev/null +++ b/pkgs/games/dwarf-fortress/df2014.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile +, copyDataDirectory ? false }: + +assert stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "dwarf-fortress-0.40.04"; + + src = fetchurl { + url = "http://www.bay12games.com/dwarves/df_40_04_linux.tar.bz2"; + sha256 = "0kzkq42mpih5lsv8bv98j8ls26a8sbb1amp8bnf04k63ai99b9zx"; + }; + + phases = "unpackPhase patchPhase installPhase"; + + /* :TODO: Game options should be configurable by patching the default configuration files */ + + permission = ./df_permission; + + installPhase = '' + set -x + mkdir -p $out/bin + mkdir -p $out/share/df_linux + cp -r * $out/share/df_linux + cp $permission $out/share/df_linux/nix_permission + + patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress + ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/ + + cat > $out/bin/dwarf-fortress << EOF + #!${stdenv.shell} + export DF_DIR="\$HOME/.config/df_linux" + if [ -n "\$XDG_DATA_HOME" ] + then export DF_DIR="\$XDG_DATA_HOME/df_linux" + fi + + # Recreate a directory structure reflecting the original + # distribution in the user directory (for modding support) + ${if copyDataDirectory then '' + if [ ! -d "\$DF_DIR" ]; + then + mkdir -p \$DF_DIR + cp -r $out/share/df_linux/* \$DF_DIR/ + chmod -R u+rw \$DF_DIR/ + fi + '' else '' + # Link in the static stuff + mkdir -p \$DF_DIR + ln -sf $out/share/df_linux/libs \$DF_DIR/ + ln -sf $out/share/df_linux/raw \$DF_DIR/ + ln -sf $out/share/df_linux/df \$DF_DIR/ + + # Delete old data directory + rm -rf \$DF_DIR/data + + # Link in the static data directory + mkdir \$DF_DIR/data + for i in $out/share/df_linux/data/* + do + ln -s \$i \$DF_DIR/data/ + done + + # link in persistant data + mkdir -p \$DF_DIR/save + ln -s \$DF_DIR/save \$DF_DIR/data/ + ''} + + # now run Dwarf Fortress! + export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/ + \$DF_DIR/df "\$@" + EOF + + chmod +x $out/bin/dwarf-fortress + ''; + + meta = { + description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; + homepage = http://www.bay12games.com/dwarves; + license = "unfree-redistributable"; + maintainers = [stdenv.lib.maintainers.roconnor]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c255103bb01..5ae67cd1688a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10129,10 +10129,20 @@ let }; }; + dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix { + SDL_image = pkgsi686Linux.SDL_image.override { + libpng = pkgsi686Linux.libpng12; + }; + }; + dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { copyDataDirectory = true; }); + dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override { + copyDataDirectory = true; + }); + dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; From 49e6ef2a19161ffbbdede9451bf22b0d33cd71cb Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 25 Jul 2014 13:22:33 +0200 Subject: [PATCH 004/286] Fix trackpoint configuration on some systems --- nixos/modules/tasks/trackpoint.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 4be2c3eb4c47..25ada145ac69 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -54,10 +54,17 @@ with lib; task = true; script = '' - echo -n ${toString config.hardware.trackpoint.sensitivity} \ - > /sys/devices/platform/i8042/serio1/sensitivity - echo -n ${toString config.hardware.trackpoint.speed} \ - > /sys/devices/platform/i8042/serio1/speed + for directory in /sys/devices/platform/i8042/serio1 \ + /sys/devices/platform/i8042/serio1/serio2 \ + /sys/devices/platform/i8042/serio4/serio5; do + if [ -e "$directory/speed" ]; then + echo -n ${toString config.hardware.trackpoint.speed} \ + > "$directory/speed" + echo -n ${toString config.hardware.trackpoint.sensitivity} \ + > "$directory/sensitivity" + break + fi + done ''; }; From 826e96af0e9fb2f26043e75b6466dce9bdf7de61 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 4 Jul 2014 18:26:14 +0200 Subject: [PATCH 005/286] Add dungeon crawl stone soup 0.14 --- pkgs/games/crawl/default.nix | 24 +++++++++++++++ pkgs/games/crawl/makefile_fonts.patch | 20 ++++++++++++ pkgs/games/crawl/makefile_misc.patch | 39 ++++++++++++++++++++++++ pkgs/games/crawl/makefile_prefix.patch | 11 +++++++ pkgs/games/crawl/makefile_rltiles.patch | 21 +++++++++++++ pkgs/games/crawl/makefile_rltiles2.patch | 10 ++++++ pkgs/games/crawl/makefile_sdlimg.patch | 19 ++++++++++++ pkgs/games/crawl/makefile_sqlite.patch | 11 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 9 files changed, 157 insertions(+) create mode 100644 pkgs/games/crawl/default.nix create mode 100644 pkgs/games/crawl/makefile_fonts.patch create mode 100644 pkgs/games/crawl/makefile_misc.patch create mode 100644 pkgs/games/crawl/makefile_prefix.patch create mode 100644 pkgs/games/crawl/makefile_rltiles.patch create mode 100644 pkgs/games/crawl/makefile_rltiles2.patch create mode 100644 pkgs/games/crawl/makefile_sdlimg.patch create mode 100644 pkgs/games/crawl/makefile_sqlite.patch diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix new file mode 100644 index 000000000000..6cb48d85f852 --- /dev/null +++ b/pkgs/games/crawl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, sqlite, lua, which, zlib, pkgconfig, dejavu_fonts, + libpng, perl, SDL, SDL_image, ncurses, mesa}: + +stdenv.mkDerivation rec { + name = "crawl-0.14.1"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/crawl-ref/Stone%20Soup/0.14.1/stone_soup-0.14.1-nodeps.tar.xz"; + sha256 = "91726d0224b93ba26b5d4bd3762bc5aabe1f02974ea6c937be89dc6c6ab7a4dd"; + }; + + patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch + ./makefile_rltiles.patch ./makefile_rltiles2.patch + ./makefile_misc.patch ./makefile_prefix.patch + ]; + + buildInputs = [stdenv pkgconfig lua zlib sqlite which libpng perl SDL + dejavu_fonts SDL_image ncurses mesa]; + + preBuild = "cd source"; + + makeFlags = "TILES=y"; + + inherit dejavu_fonts sqlite SDL_image SDL; +} diff --git a/pkgs/games/crawl/makefile_fonts.patch b/pkgs/games/crawl/makefile_fonts.patch new file mode 100644 index 000000000000..6c73407b65cd --- /dev/null +++ b/pkgs/games/crawl/makefile_fonts.patch @@ -0,0 +1,20 @@ +--- old/source/Makefile 2013-11-28 01:03:54.000000000 +0000 ++++ new/source/Makefile 2014-02-05 14:04:32.531838188 +0000 +@@ -880,7 +880,7 @@ + INSTALL_FONTS += $(PROPORTIONAL_FONT) + endif + else +- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ++ SYS_PROPORTIONAL_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + ifeq (,$(SYS_PROPORTIONAL_FONT)) + SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + endif +@@ -903,7 +903,7 @@ + INSTALL_FONTS += $(MONOSPACED_FONT) + endif + else +- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) ++ SYS_MONOSPACED_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + ifeq (,$(SYS_MONOSPACED_FONT)) + SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + endif diff --git a/pkgs/games/crawl/makefile_misc.patch b/pkgs/games/crawl/makefile_misc.patch new file mode 100644 index 000000000000..3849e79234b0 --- /dev/null +++ b/pkgs/games/crawl/makefile_misc.patch @@ -0,0 +1,39 @@ +--- old/source/Makefile 2014-05-05 23:22:48.051952484 +0200 ++++ new/source/Makefile 2014-05-05 23:20:46.576617833 +0200 +@@ -71,6 +71,9 @@ + + GAME = crawl + ++ ++CFLAGS := $(NIX_CFLAGS_COMPILE) ++ + # Disable GNU Make implicit rules and variables. Leaving them enabled will slow + # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have + # _explicit_ rules defined for everything. So we don't need them. +@@ -979,7 +983,7 @@ + ifdef ANDROID + CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + else +-CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) ++CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + endif + CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) + ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) +@@ -1392,7 +1396,7 @@ + $(RM) -r $(DOXYGEN_HTML_GEN) + + $(GAME): $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS) dat/dlua/tags.lua +- +$(QUIET_LINK)$(CXX) $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) ++ g++ $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) + + debug: all + debug-lite: all +@@ -1492,7 +1496,7 @@ + $(QUIET_GEN)util/gen-luatags.pl + + mi-enum.h: mon-info.h util/gen-mi-enum +- $(QUIET_GEN)util/gen-mi-enum ++ perl util/gen-mi-enum + + $(RLTILES)/dc-unrand.txt: art-data.h + diff --git a/pkgs/games/crawl/makefile_prefix.patch b/pkgs/games/crawl/makefile_prefix.patch new file mode 100644 index 000000000000..869d703b125d --- /dev/null +++ b/pkgs/games/crawl/makefile_prefix.patch @@ -0,0 +1,11 @@ +--- old/source/Makefile 2014-05-06 08:52:24.752163702 +0200 ++++ new/source/Makefile 2014-05-06 09:08:01.992018819 +0200 +@@ -344,7 +344,7 @@ + endif + + chroot_prefix := +-prefix := ++prefix := $(out) + + ifeq ($(patsubst %/local,%,$(patsubst %/,%,$(prefix))),/usr) + FHS := yes diff --git a/pkgs/games/crawl/makefile_rltiles.patch b/pkgs/games/crawl/makefile_rltiles.patch new file mode 100644 index 000000000000..e08859c989b3 --- /dev/null +++ b/pkgs/games/crawl/makefile_rltiles.patch @@ -0,0 +1,21 @@ +--- old/source/rltiles/Makefile 2014-04-17 10:17:31.596400123 +0000 ++++ new/source/rltiles/Makefile 2014-04-17 14:36:07.263108690 +0000 +@@ -20,7 +20,8 @@ + + ifdef TILES + ifndef CONTRIB_SDL +- SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include/SDL") ++ SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null) ++ SDL_IMG_CFLAGS := $(shell pkg-config --cflags-only-I SDL_image 2> /dev/null) + SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null && echo "-lSDL_image" || echo "../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a") + else + SDL_CFLAGS := -I../contrib/install/$(ARCH)/include/SDL +@@ -35,7 +36,7 @@ + PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a + endif + +- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) ++ CFLAGS += $(SDL_CFLAGS) $(SDL_IMG_CFLAGS) $(PNG_INCLUDE) -I$(SDL_image)/include -I$(SDL)/include + LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) + + CFLAGS += -DUSE_TILE diff --git a/pkgs/games/crawl/makefile_rltiles2.patch b/pkgs/games/crawl/makefile_rltiles2.patch new file mode 100644 index 000000000000..2508ad0a54ca --- /dev/null +++ b/pkgs/games/crawl/makefile_rltiles2.patch @@ -0,0 +1,10 @@ +--- old/source/rltiles/Makefile 2014-05-05 23:22:48.054952469 +0200 ++++ new/source/rltiles/Makefile 2014-05-05 22:45:07.742667726 +0200 +@@ -142,6 +128,6 @@ + $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ + + $(TILEGEN): $(OBJECTS) +- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) ++ g++ $(OBJECTS) -o $@ $(LDFLAGS) + + .PHONY: all clean distclean diff --git a/pkgs/games/crawl/makefile_sdlimg.patch b/pkgs/games/crawl/makefile_sdlimg.patch new file mode 100644 index 000000000000..e6c7101de720 --- /dev/null +++ b/pkgs/games/crawl/makefile_sdlimg.patch @@ -0,0 +1,19 @@ +--- old/source/Makefile 2014-04-14 13:00:22.331058910 +0000 ++++ new/source/Makefile 2014-04-14 13:02:11.102204544 +0000 +@@ -672,6 +672,7 @@ + FREETYPE_LDFLAGS := $(shell $(PKGCONFIG) freetype2 --libs-only-L) $(shell $(PKGCONFIG) freetype2 --libs-only-l) + + SDL_INCLUDE := $(shell $(PKGCONFIG) sdl --cflags-only-I) ++SDL_IMG_INCLUDE := $(shell $(PKGCONFIG) SDL_image --cflags-only-I) + SDL_CFLAGS := $(shell $(PKGCONFIG) sdl --cflags-only-other) + SDL_LDFLAGS := $(shell $(PKGCONFIG) sdl --libs-only-L) $(shell $(PKGCONFIG) sdl --libs-only-l) + +@@ -694,7 +695,7 @@ + endif + + DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) +-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) ++INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) $(SDL_IMG_INCLUDE) + + endif # TILES + diff --git a/pkgs/games/crawl/makefile_sqlite.patch b/pkgs/games/crawl/makefile_sqlite.patch new file mode 100644 index 000000000000..fbcb925d6088 --- /dev/null +++ b/pkgs/games/crawl/makefile_sqlite.patch @@ -0,0 +1,11 @@ +--- old/source/Makefile 2014-04-14 12:46:35.401956673 +0000 ++++ new/source/Makefile 2014-04-14 12:47:12.757006254 +0000 +@@ -259,7 +259,7 @@ + LIBZ := contrib/install/$(ARCH)/lib/libz.a + + ifndef CROSSHOST +- SQLITE_INCLUDE_DIR := /usr/include ++ SQLITE_INCLUDE_DIR := ${sqlite}/include + else + # This is totally wrong, works only with some old-style setups, and + # on some architectures of Debian/new FHS multiarch -- excluding, for diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d321fd2d802..c476c307066d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,6 +611,8 @@ let cv = callPackage ../tools/misc/cv { }; + crawl = callPackage ../games/crawl { lua = lua5; }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; From 6fe59796b2e79a5c2c15d7977eacb6f08b982a5b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 25 Jul 2014 17:40:13 +0200 Subject: [PATCH 006/286] Use a udev rule for trackpoint configuration --- nixos/modules/tasks/trackpoint.nix | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 25ada145ac69..d2d46c8c45a4 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -46,28 +46,10 @@ with lib; config = mkIf config.hardware.trackpoint.enable { - jobs.trackpoint = - { description = "Initialize trackpoint"; - - startOn = "started udev"; - - task = true; - - script = '' - for directory in /sys/devices/platform/i8042/serio1 \ - /sys/devices/platform/i8042/serio1/serio2 \ - /sys/devices/platform/i8042/serio4/serio5; do - if [ -e "$directory/speed" ]; then - echo -n ${toString config.hardware.trackpoint.speed} \ - > "$directory/speed" - echo -n ${toString config.hardware.trackpoint.sensitivity} \ - > "$directory/sensitivity" - break - fi - done - ''; - }; - + services.udev.extraRules = + '' + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" + ''; }; } From 50f548771e016bc6563b5b6b23a49c2ed6da88a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jul 2014 11:28:35 +0200 Subject: [PATCH 007/286] Fix broken use of builtins.currentSystem Packages should never use builtins.currentSystem. --- pkgs/misc/drivers/hplip/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index fcec3bf26754..a4d2ca621a1c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -56,11 +56,9 @@ stdenv.mkDerivation rec { '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = - if builtins.currentSystem == "i686-linux" - then "x86_32" - else if builtins.currentSystem == "x86_64-linux" - then "x86_64" - else abort "Platform must be i686-linux or x86_64-linux!"; + if stdenv.system == "i686-linux" then "x86_32" + else if stdenv.system == "x86_64-linux" then "x86_64" + else abort "Platform must be i686-linux or x86_64-linux!"; in '' sh ${plugin} --noexec --keep From 7a459962331e095cabd0cf5d56106727648a1824 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 19 Jun 2014 06:19:00 +0200 Subject: [PATCH 008/286] Turn some license strings into lib.licenses values --- pkgs/applications/audio/abcde/default.nix | 2 +- pkgs/applications/audio/audacity/default.nix | 2 +- pkgs/applications/audio/aumix/default.nix | 2 +- pkgs/applications/audio/cd-discid/default.nix | 2 +- pkgs/applications/audio/espeak/default.nix | 2 +- pkgs/applications/audio/espeak/edit.nix | 2 +- pkgs/applications/audio/gmu/default.nix | 2 +- pkgs/applications/audio/gtkpod/default.nix | 2 +- pkgs/applications/audio/id3v2/default.nix | 2 +- pkgs/applications/audio/jackmeter/default.nix | 2 +- pkgs/applications/audio/lingot/default.nix | 2 +- pkgs/applications/audio/mikmod/default.nix | 2 +- pkgs/applications/audio/mp3info/default.nix | 2 +- pkgs/applications/audio/mpc/default.nix | 2 +- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/audio/mpg321/default.nix | 2 +- .../audio/pavucontrol/default.nix | 2 +- pkgs/applications/audio/praat/default.nix | 2 +- pkgs/applications/audio/spotify/default.nix | 2 +- .../audio/vorbis-tools/default.nix | 2 +- pkgs/applications/editors/bvi/default.nix | 2 +- pkgs/applications/editors/ed/default.nix | 2 +- .../emacs-modes/auto-complete/default.nix | 2 +- .../editors/emacs-modes/calfw/default.nix | 2 +- .../editors/emacs-modes/cedet/default.nix | 2 +- .../editors/emacs-modes/coffee/default.nix | 2 +- .../emacs-modes/color-theme/default.nix | 2 +- .../editors/emacs-modes/darcsum/default.nix | 2 +- .../editors/emacs-modes/ecb/default.nix | 2 +- .../emacs-clang-complete-async/default.nix | 3 +- .../editors/emacs-modes/emacs-w3m/default.nix | 2 +- .../editors/emacs-modes/emms/default.nix | 2 +- .../editors/emacs-modes/gh/default.nix | 2 +- .../editors/emacs-modes/gist/default.nix | 2 +- .../editors/emacs-modes/idris/default.nix | 2 +- .../editors/emacs-modes/jade/default.nix | 2 +- .../editors/emacs-modes/jdee/default.nix | 2 +- .../editors/emacs-modes/logito/default.nix | 2 +- .../emacs-modes/lorem-ipsum/default.nix | 2 +- .../editors/emacs-modes/magit/default.nix | 2 +- .../editors/emacs-modes/maude/default.nix | 2 +- .../emacs-modes/metaweblog/default.nix | 2 +- .../editors/emacs-modes/org/default.nix | 2 +- .../editors/emacs-modes/org2blog/default.nix | 2 +- .../editors/emacs-modes/pcache/default.nix | 2 +- .../editors/emacs-modes/proofgeneral/4.2.nix | 4 +- .../editors/emacs-modes/quack/default.nix | 2 +- .../editors/emacs-modes/rect-mark/default.nix | 2 +- .../editors/emacs-modes/remember/default.nix | 2 +- .../emacs-modes/sunrise-commander/default.nix | 2 +- .../editors/emacs-modes/writegood/default.nix | 2 +- .../editors/emacs-modes/xml-rpc/default.nix | 2 +- pkgs/applications/editors/flpsed/default.nix | 2 +- pkgs/applications/editors/gobby/default.nix | 2 +- pkgs/applications/editors/sublime/default.nix | 2 +- .../applications/editors/sublime3/default.nix | 3 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/editors/zile/default.nix | 2 +- .../graphics/autopanosiftc/default.nix | 2 +- .../applications/graphics/comical/default.nix | 2 +- pkgs/applications/graphics/djview/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- .../graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/giv/default.nix | 2 +- pkgs/applications/graphics/gocr/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/graphics/ipe/default.nix | 2 +- pkgs/applications/graphics/mcomix/default.nix | 2 +- .../applications/graphics/meshlab/default.nix | 2 +- .../graphics/minidjvu/default.nix | 2 +- pkgs/applications/graphics/mirage/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- .../graphics/panotools/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 2 +- .../applications/graphics/potrace/default.nix | 2 +- .../graphics/qtpfsgui/default.nix | 2 +- pkgs/applications/graphics/sane/backends.nix | 2 +- pkgs/applications/graphics/sane/frontends.nix | 2 +- pkgs/applications/graphics/sane/xsane.nix | 2 +- .../graphics/smartdeblur/default.nix | 3 +- pkgs/applications/graphics/sxiv/default.nix | 2 +- .../graphics/tesseract/default.nix | 2 +- pkgs/applications/graphics/ufraw/default.nix | 2 +- .../graphics/viewnior/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 2 +- pkgs/applications/misc/abook/default.nix | 2 +- .../misc/adobe-reader/default.nix | 2 +- pkgs/applications/misc/audio/soxr/default.nix | 2 +- pkgs/applications/misc/bibletime/default.nix | 2 +- pkgs/applications/misc/bitcoin/default.nix | 2 +- pkgs/applications/misc/d4x/default.nix | 2 +- pkgs/applications/misc/dmenu/default.nix | 3 +- pkgs/applications/misc/epdfview/default.nix | 2 +- pkgs/applications/misc/evopedia/default.nix | 2 +- pkgs/applications/misc/evtest/default.nix | 2 +- pkgs/applications/misc/freicoin/default.nix | 2 +- pkgs/applications/misc/gkrellm/default.nix | 2 +- .../applications/misc/googleearth/default.nix | 2 +- pkgs/applications/misc/gpsbabel/default.nix | 2 +- .../misc/gpscorrelate/default.nix | 2 +- pkgs/applications/misc/grip/default.nix | 2 +- pkgs/applications/misc/gv/default.nix | 2 +- pkgs/applications/misc/htmldoc/default.nix | 2 +- pkgs/applications/misc/ikiwiki/default.nix | 2 +- pkgs/applications/misc/jigdo/default.nix | 2 +- pkgs/applications/misc/librecad/2.0.nix | 2 +- pkgs/applications/misc/librecad/default.nix | 2 +- pkgs/applications/misc/lyx/default.nix | 2 +- pkgs/applications/misc/merkaartor/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- pkgs/applications/misc/navipowm/default.nix | 2 +- pkgs/applications/misc/navit/default.nix | 2 +- pkgs/applications/misc/openjump/default.nix | 2 +- pkgs/applications/misc/qgis/default.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 2 +- pkgs/applications/misc/sakura/default.nix | 2 +- pkgs/applications/misc/st/default.nix | 2 +- pkgs/applications/misc/stardict/stardict.nix | 3 +- pkgs/applications/misc/surf/default.nix | 2 +- pkgs/applications/misc/tangogps/default.nix | 2 +- .../applications/misc/taskjuggler/default.nix | 2 +- pkgs/applications/misc/vanitygen/default.nix | 2 +- pkgs/applications/misc/viking/default.nix | 2 +- pkgs/applications/misc/wmname/default.nix | 2 +- pkgs/applications/misc/xfe/default.nix | 2 +- pkgs/applications/misc/xneur/default.nix | 2 +- .../networking/browsers/elinks/default.nix | 2 +- .../flashplayer-11/default.nix | 2 +- .../google-talk-plugin/default.nix | 2 +- .../networking/browsers/netsurf/default.nix | 4 +- .../networking/browsers/netsurf/libCSS.nix | 2 +- .../browsers/netsurf/libParserUtils.nix | 2 +- .../networking/browsers/netsurf/libnsbmp.nix | 2 +- .../networking/browsers/netsurf/libnsgif.nix | 2 +- .../browsers/netsurf/libsvgtiny.nix | 2 +- .../browsers/netsurf/libwapcaplet.nix | 2 +- .../networking/ids/daq/default.nix | 2 +- .../networking/ids/snort/default.nix | 2 +- .../instant-messengers/bitlbee/default.nix | 2 +- .../instant-messengers/centerim/default.nix | 2 +- .../instant-messengers/gtmess/default.nix | 2 +- .../instant-messengers/kadu/default.nix | 2 +- .../instant-messengers/linphone/default.nix | 2 +- .../pidgin-plugins/otr/default.nix | 2 +- .../pidgin-plugins/skype4pidgin/default.nix | 2 +- .../pidgin-plugins/tox-prpl/default.nix | 2 +- .../instant-messengers/sflphone/default.nix | 2 +- .../silc-client/default.nix | 2 +- .../skype-call-recorder/default.nix | 2 +- .../instant-messengers/skype/default.nix | 2 +- .../telegram-cli/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- .../networking/iptraf/default.nix | 2 +- .../networking/irc/ii/default.nix | 2 +- .../networking/irc/irssi/fish/default.nix | 2 +- .../networking/irc/irssi/otr/default.nix | 2 +- .../networking/irc/quassel/default.nix | 3 +- .../networking/mailreaders/mutt/default.nix | 3 +- .../networking/p2p/freenet/default.nix | 2 +- .../networking/p2p/gnunet/default.nix | 2 +- .../networking/p2p/gnunet/svn.nix | 2 +- .../networking/p2p/tribler/default.nix | 2 +- .../applications/networking/pjsip/default.nix | 2 +- .../networking/remote/remmina/default.nix | 2 +- .../networking/remote/ssvnc/default.nix | 2 +- .../networking/remote/teamviewer/8.nix | 2 +- .../networking/remote/teamviewer/default.nix | 2 +- .../networking/sniffers/etherape/default.nix | 2 +- .../networking/sync/unison/default.nix | 2 +- .../networking/vnstat/default.nix | 2 +- pkgs/applications/networking/yafc/default.nix | 2 +- .../applications/office/eventlist/default.nix | 2 +- pkgs/applications/office/gnucash/default.nix | 2 +- pkgs/applications/office/gnumeric/default.nix | 2 +- pkgs/applications/office/homebank/default.nix | 2 +- .../office/impressive/default.nix | 2 +- pkgs/applications/office/keepnote/default.nix | 2 +- pkgs/applications/office/mmex/default.nix | 2 +- pkgs/applications/office/scribus/default.nix | 2 +- .../science/astronomy/gravit/default.nix | 2 +- .../science/biology/plink/default.nix | 2 +- .../electronics/archimedes/default.nix | 2 +- .../science/electronics/caneda/default.nix | 2 +- .../science/electronics/gtkwave/default.nix | 2 +- .../science/electronics/kicad/default.nix | 2 +- .../science/electronics/qucs/default.nix | 2 +- .../science/electronics/tkgate/1.x.nix | 2 +- .../science/electronics/tkgate/2.x.nix | 2 +- .../science/electronics/verilog/default.nix | 2 +- .../science/electronics/xoscope/default.nix | 2 +- .../science/geometry/tetgen/default.nix | 2 +- .../science/logic/iprover/default.nix | 3 +- .../science/logic/logisim/default.nix | 2 +- .../science/logic/matita/130312.nix | 2 +- .../science/logic/matita/default.nix | 2 +- .../science/logic/minisat/default.nix | 3 +- .../science/logic/opensmt/default.nix | 3 +- .../science/logic/picosat/default.nix | 2 +- .../science/math/eukleides/default.nix | 2 +- .../applications/science/math/gap/default.nix | 3 +- .../science/math/mathematica/default.nix | 2 +- .../science/math/maxima/default.nix | 2 +- .../science/math/singular/default.nix | 3 +- .../science/math/weka/default.nix | 2 +- .../science/math/wxmaxima/default.nix | 2 +- .../science/math/yacas/default.nix | 2 +- .../science/misc/boinc/default.nix | 2 +- .../science/misc/golly/default.nix | 3 +- .../science/misc/simgrid/default.nix | 2 +- .../science/misc/tulip/default.nix | 2 +- pkgs/applications/search/doodle/default.nix | 2 +- .../version-management/cvsps/default.nix | 2 +- .../git-and-tools/qgit/default.nix | 2 +- .../git-and-tools/qgit/qgit-git.nix | 2 +- .../git-and-tools/topgit/default.nix | 2 +- .../version-management/meld/default.nix | 2 +- .../version-management/mercurial/default.nix | 2 +- .../version-management/mr/default.nix | 2 +- .../version-management/rapidsvn/default.nix | 2 +- .../version-management/rcs/default.nix | 2 +- .../version-management/tkcvs/default.nix | 2 +- pkgs/applications/video/avxsynth/default.nix | 2 +- pkgs/applications/video/bangarang/default.nix | 2 +- pkgs/applications/video/cinelerra/default.nix | 2 +- pkgs/applications/video/coriander/default.nix | 2 +- pkgs/applications/video/dvb-apps/default.nix | 2 +- pkgs/applications/video/gnash/default.nix | 2 +- pkgs/applications/video/kino/default.nix | 2 +- pkgs/applications/video/lxdvdrip/default.nix | 2 +- pkgs/applications/video/makemkv/default.nix | 2 +- pkgs/applications/video/mplayer/default.nix | 2 +- pkgs/applications/video/mplayer2/default.nix | 4 +- pkgs/applications/video/ogmtools/default.nix | 2 +- pkgs/applications/video/omxplayer/default.nix | 2 +- pkgs/applications/video/quvi/tool.nix | 3 +- pkgs/applications/video/xvidcap/default.nix | 2 +- .../virtualization/virtinst/default.nix | 2 +- .../window-managers/awesome/3.4.nix | 2 +- .../window-managers/dwm/default.nix | 2 +- .../window-managers/fvwm/default.nix | 3 +- .../window-managers/matchbox/default.nix | 2 +- .../window-managers/openbox/default.nix | 2 +- .../window-managers/ratpoison/default.nix | 2 +- pkgs/data/fonts/freefont-ttf/default.nix | 2 +- pkgs/data/misc/miscfiles/default.nix | 2 +- pkgs/desktops/gnome-2/desktop/vte/default.nix | 2 +- .../gnome-2/platform/gconfmm/default.nix | 2 +- .../gnome-2/platform/gtkglext/default.nix | 2 +- .../gnome-2/platform/gtkglextmm/default.nix | 2 +- .../gnome-3/3.10/core/evince/default.nix | 2 +- .../gnome-3/3.10/core/folks/default.nix | 2 +- .../gnome-3/3.10/core/vte/default.nix | 2 +- .../gnome-3/3.10/misc/goffice/default.nix | 2 +- .../gnome-3/3.12/core/evince/default.nix | 2 +- .../gnome-3/3.12/core/folks/default.nix | 2 +- .../gnome-3/3.12/core/vte/default.nix | 2 +- .../gnome-3/3.12/misc/goffice/default.nix | 2 +- pkgs/desktops/kde-4.12/applications/kate.nix | 2 +- .../kde-4.12/applications/konsole.nix | 2 +- .../kde-4.12/kde-baseapps/kde-baseapps.nix | 2 +- pkgs/desktops/kde-4.12/kde-workspace.nix | 2 +- .../kde-4.12/kdebindings/smokegen.nix | 2 +- .../desktops/kde-4.12/kdebindings/smokeqt.nix | 2 +- .../kde-4.12/kdegraphics/gwenview.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kamera.nix | 2 +- .../kde-4.12/kdegraphics/kcolorchooser.nix | 2 +- .../kdegraphics/kdegraphics-mobipocket.nix | 2 +- .../kdegraphics-strigi-analyzer.nix | 2 +- .../kdegraphics/kdegraphics-thumbnailers.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix | 2 +- .../kde-4.12/kdegraphics/kolourpaint.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kruler.nix | 2 +- .../kde-4.12/kdegraphics/ksaneplugin.nix | 2 +- .../kde-4.12/kdegraphics/ksnapshot.nix | 2 +- .../kde-4.12/kdegraphics/libkdcraw.nix | 2 +- .../kde-4.12/kdegraphics/libkexiv2.nix | 2 +- .../desktops/kde-4.12/kdegraphics/libkipi.nix | 2 +- .../kde-4.12/kdegraphics/libksane.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/okular.nix | 2 +- .../desktops/kde-4.12/kdegraphics/svgpart.nix | 2 +- .../kde-4.12/kdelibs/nepomuk-core.nix | 2 +- .../kde-4.12/kdelibs/nepomuk-widgets.nix | 2 +- pkgs/desktops/xfce/applications/mousepad.nix | 2 +- pkgs/desktops/xfce/applications/ristretto.nix | 2 +- pkgs/desktops/xfce/applications/terminal.nix | 2 +- .../xfce/applications/xfce4-mixer.nix | 2 +- .../xfce/applications/xfce4-notifyd.nix | 2 +- .../xfce/applications/xfce4-screenshooter.nix | 2 +- pkgs/desktops/xfce/core/exo.nix | 2 +- pkgs/desktops/xfce/core/garcon.nix | 2 +- pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 2 +- pkgs/desktops/xfce/core/libxfce4ui.nix | 2 +- pkgs/desktops/xfce/core/libxfcegui4.nix | 2 +- .../xfce/core/thunar-archive-plugin.nix | 2 +- pkgs/desktops/xfce/core/thunar-volman.nix | 2 +- pkgs/desktops/xfce/core/thunar.nix | 2 +- pkgs/desktops/xfce/core/tumbler.nix | 2 +- pkgs/desktops/xfce/core/xfce4-appfinder.nix | 2 +- pkgs/desktops/xfce/core/xfce4-dev-tools.nix | 2 +- pkgs/desktops/xfce/core/xfce4-panel.nix | 2 +- .../xfce/core/xfce4-power-manager.nix | 2 +- pkgs/desktops/xfce/core/xfce4-session.nix | 2 +- pkgs/desktops/xfce/core/xfce4-settings.nix | 2 +- pkgs/desktops/xfce/core/xfconf.nix | 2 +- pkgs/desktops/xfce/core/xfdesktop.nix | 2 +- pkgs/desktops/xfce/core/xfwm4.nix | 2 +- .../compilers/adobe-flex-sdk/default.nix | 2 +- pkgs/development/compilers/bigloo/default.nix | 2 +- .../development/compilers/gcc/4.3/default.nix | 2 +- .../development/compilers/gcc/4.4/default.nix | 4 +- .../development/compilers/gcc/4.5/default.nix | 4 +- .../development/compilers/gcc/4.6/default.nix | 4 +- .../development/compilers/gcc/4.8/default.nix | 2 +- .../development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/ghdl/default.nix | 2 +- .../compilers/gnatboot/default.nix | 2 +- pkgs/development/compilers/ikarus/default.nix | 2 +- .../compilers/llvm/3.4/dragonegg.nix | 2 +- .../compilers/mit-scheme/default.nix | 2 +- pkgs/development/compilers/opendylan/bin.nix | 2 +- .../compilers/opendylan/default.nix | 2 +- .../development/compilers/openjdk/default.nix | 2 +- .../compilers/oraclejdk/jdk-linux-base.nix | 2 +- .../compilers/oraclejdk/jdk6-linux.nix | 2 +- pkgs/development/compilers/stalin/default.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- .../guile-modules/guile-cairo/default.nix | 2 +- .../guile-modules/guile-gnome/default.nix | 2 +- .../guile-modules/guile-lib/default.nix | 2 +- .../guile-modules/guile-ncurses/default.nix | 2 +- pkgs/development/interpreters/guile/1.8.nix | 2 +- pkgs/development/interpreters/love/0.9.nix | 2 +- .../development/interpreters/love/default.nix | 2 +- .../interpreters/lua-4/default.nix | 2 +- pkgs/development/interpreters/lua-5/5.0.3.nix | 2 +- pkgs/development/interpreters/lua-5/5.1.nix | 2 +- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- .../interpreters/maude/default.nix | 2 +- .../interpreters/octave/default.nix | 2 +- pkgs/development/interpreters/octave/hg.nix | 2 +- .../interpreters/renpy/default.nix | 2 +- .../libraries/SDL2_gfx/default.nix | 2 +- .../development/libraries/SDL_gfx/default.nix | 2 +- pkgs/development/libraries/adns/default.nix | 2 +- pkgs/development/libraries/agg/default.nix | 2 +- pkgs/development/libraries/amrnb/default.nix | 2 +- pkgs/development/libraries/amrwb/default.nix | 2 +- pkgs/development/libraries/aspell/default.nix | 2 +- pkgs/development/libraries/atk/default.nix | 2 +- pkgs/development/libraries/babl/0_0_22.nix | 2 +- pkgs/development/libraries/babl/default.nix | 2 +- pkgs/development/libraries/caelum/default.nix | 2 +- pkgs/development/libraries/ccrtp/1.8.nix | 2 +- pkgs/development/libraries/ccrtp/default.nix | 2 +- pkgs/development/libraries/check/default.nix | 2 +- .../libraries/classads/default.nix | 2 +- .../libraries/cloog-ppl/default.nix | 2 +- pkgs/development/libraries/cloog/default.nix | 2 +- .../libraries/clutter-gst/default.nix | 2 +- .../libraries/clutter-gtk/0.10.8.nix | 2 +- .../libraries/clutter-gtk/default.nix | 2 +- pkgs/development/libraries/clutter/1.18.nix | 2 +- .../development/libraries/clutter/default.nix | 2 +- pkgs/development/libraries/coin3d/default.nix | 2 +- .../libraries/commoncpp2/default.nix | 2 +- .../development/libraries/dotconf/default.nix | 2 +- pkgs/development/libraries/exosip/3.x.nix | 2 +- pkgs/development/libraries/exosip/default.nix | 2 +- pkgs/development/libraries/faad2/default.nix | 2 +- pkgs/development/libraries/ffms/default.nix | 2 +- pkgs/development/libraries/fox/default.nix | 2 +- pkgs/development/libraries/fox/fox-1.6.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdbm/default.nix | 2 +- pkgs/development/libraries/gdome2/default.nix | 2 +- pkgs/development/libraries/gegl/0_0_22.nix | 2 +- pkgs/development/libraries/gegl/default.nix | 2 +- .../libraries/glibc/2.19/common.nix | 2 +- pkgs/development/libraries/glibmm/default.nix | 2 +- pkgs/development/libraries/glpk/default.nix | 2 +- pkgs/development/libraries/gmm/default.nix | 2 +- pkgs/development/libraries/gmp/4.3.2.nix | 2 +- pkgs/development/libraries/gmp/5.0.5.nix | 2 +- pkgs/development/libraries/gnutls/3.1.nix | 3 +- pkgs/development/libraries/gnutls/3.2.nix | 3 +- pkgs/development/libraries/gsasl/default.nix | 2 +- pkgs/development/libraries/gsl/default.nix | 2 +- pkgs/development/libraries/gss/default.nix | 2 +- pkgs/development/libraries/gssdp/default.nix | 2 +- .../gstreamer/legacy/gnonlin/default.nix | 2 +- .../gstreamer/legacy/gst-ffmpeg/default.nix | 2 +- .../legacy/gst-plugins-bad/default.nix | 2 +- .../legacy/gst-plugins-good/default.nix | 2 +- .../legacy/gst-plugins-ugly/default.nix | 2 +- .../gstreamer/legacy/gst-python/default.nix | 3 +- .../gstreamer/legacy/gstreamer/default.nix | 2 +- .../gstreamer/legacy/gstreamermm/default.nix | 2 +- .../libraries/gstreamer/python/default.nix | 3 +- pkgs/development/libraries/gtk+/3.x.nix | 2 +- .../libraries/gtkdatabox/default.nix | 2 +- .../libraries/gtkimageview/default.nix | 2 +- .../libraries/gtkmathview/default.nix | 2 +- pkgs/development/libraries/gtkmm/2.x.nix | 2 +- pkgs/development/libraries/gtkmm/3.x.nix | 2 +- pkgs/development/libraries/gts/default.nix | 2 +- .../libraries/haskell/hflags/default.nix | 2 +- pkgs/development/libraries/hawknl/default.nix | 2 +- .../libraries/iniparser/default.nix | 2 +- .../libraries/irrlicht/default.nix | 2 +- pkgs/development/libraries/isl/0.12.2.nix | 2 +- pkgs/development/libraries/isl/default.nix | 2 +- .../development/libraries/jansson/default.nix | 2 +- .../libraries/java/geoipjava/default.nix | 2 +- .../libraries/jbig2dec/default.nix | 2 +- pkgs/development/libraries/judy/default.nix | 2 +- pkgs/development/libraries/lcms/default.nix | 2 +- pkgs/development/libraries/lcms2/default.nix | 2 +- .../development/libraries/lensfun/default.nix | 2 +- pkgs/development/libraries/levmar/default.nix | 3 +- pkgs/development/libraries/libao/default.nix | 2 +- .../libraries/libassuan/default.nix | 2 +- pkgs/development/libraries/libassuan/git.nix | 2 +- .../libraries/libassuan1/default.nix | 2 +- pkgs/development/libraries/libbsd/default.nix | 3 +- .../libraries/libcanberra/default.nix | 2 +- .../libraries/libcangjie/default.nix | 2 +- .../development/libraries/libcddb/default.nix | 2 +- pkgs/development/libraries/libcdio/0.82.nix | 2 +- .../development/libraries/libcdio/default.nix | 2 +- .../libraries/libchamplain/0.6.nix | 2 +- .../libraries/libchamplain/default.nix | 2 +- .../development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/libcue/default.nix | 2 +- .../libraries/libdaemon/default.nix | 2 +- .../libraries/libdc1394/default.nix | 2 +- .../libraries/libdc1394avt/default.nix | 2 +- .../libraries/libdiscid/default.nix | 2 +- .../libraries/libdivsufsort/default.nix | 2 +- .../libraries/libdvbpsi/default.nix | 2 +- pkgs/development/libraries/libdwg/default.nix | 2 +- .../libraries/libeatmydata/default.nix | 2 +- pkgs/development/libraries/libelf/default.nix | 2 +- .../development/libraries/libexif/default.nix | 2 +- .../libraries/libextractor/default.nix | 2 +- .../development/libraries/libftdi/default.nix | 2 +- .../development/libraries/libgadu/default.nix | 2 +- pkgs/development/libraries/libgcrypt/1.6.nix | 2 +- .../libraries/libgcrypt/default.nix | 3 +- .../libraries/libgeotiff/default.nix | 2 +- .../libraries/libgpg-error/default.nix | 2 +- .../libraries/libiconv/default.nix | 2 +- pkgs/development/libraries/libidn/default.nix | 2 +- .../libraries/libinfinity/default.nix | 3 +- .../libraries/libiptcdata/default.nix | 2 +- pkgs/development/libraries/liblo/default.nix | 2 +- .../libraries/liblockfile/default.nix | 2 +- .../libraries/libmatchbox/default.nix | 2 +- .../libraries/libmicrohttpd/default.nix | 2 +- pkgs/development/libraries/libmnl/default.nix | 2 +- .../development/libraries/libmrss/default.nix | 2 +- .../libraries/libmspack/default.nix | 2 +- .../libnetfilter_conntrack/default.nix | 2 +- .../libraries/libnfnetlink/default.nix | 2 +- pkgs/development/libraries/libnih/default.nix | 2 +- .../development/libraries/libnxml/default.nix | 2 +- pkgs/development/libraries/libotr/default.nix | 2 +- .../libraries/libpaper/default.nix | 2 +- .../development/libraries/libpar2/default.nix | 2 +- .../libraries/libqglviewer/default.nix | 2 +- pkgs/development/libraries/librdf/default.nix | 2 +- .../libraries/librsync/default.nix | 2 +- .../libraries/libsigsegv/default.nix | 2 +- .../libraries/libspatialindex/default.nix | 2 +- .../libraries/libspectre/default.nix | 2 +- .../libraries/libtasn1/default.nix | 2 +- .../libraries/libtoxcore/default.nix | 2 +- .../libraries/libunique/default.nix | 2 +- .../libraries/libunistring/default.nix | 2 +- pkgs/development/libraries/libva/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- .../libraries/libxmlxx/default.nix | 2 +- .../libraries/libyaml-cpp/0.3.x.nix | 2 +- .../libraries/libyaml-cpp/default.nix | 2 +- pkgs/development/libraries/libzrtpcpp/1.6.nix | 2 +- .../libraries/libzrtpcpp/default.nix | 2 +- .../libraries/lightning/default.nix | 2 +- .../development/libraries/log4cpp/default.nix | 2 +- pkgs/development/libraries/lzo/default.nix | 2 +- pkgs/development/libraries/ming/default.nix | 2 +- pkgs/development/libraries/mpc/default.nix | 2 +- pkgs/development/libraries/mpfr/default.nix | 3 +- pkgs/development/libraries/mtdev/default.nix | 3 +- .../libraries/muparser/default.nix | 2 +- pkgs/development/libraries/mygui/default.nix | 2 +- pkgs/development/libraries/mygui/svn.nix | 2 +- .../libraries/mysocketw/default.nix | 2 +- .../development/libraries/ncurses/default.nix | 2 +- pkgs/development/libraries/nettle/default.nix | 2 +- pkgs/development/libraries/newt/default.nix | 2 +- pkgs/development/libraries/npth/default.nix | 2 +- pkgs/development/libraries/ogre/default.nix | 2 +- .../libraries/ogrepaged/default.nix | 2 +- .../libraries/openal-soft/default.nix | 2 +- pkgs/development/libraries/openal/default.nix | 2 +- pkgs/development/libraries/osip/3.nix | 2 +- pkgs/development/libraries/osip/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- .../libraries/pangox-compat/default.nix | 2 +- pkgs/development/libraries/pcre/default.nix | 2 +- pkgs/development/libraries/phonon/default.nix | 2 +- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/plib/default.nix | 2 +- .../development/libraries/poppler/default.nix | 2 +- .../development/libraries/postgis/default.nix | 3 +- pkgs/development/libraries/ppl/default.nix | 2 +- pkgs/development/libraries/proj/default.nix | 2 +- .../libraries/readline/readline6.3.nix | 2 +- .../libraries/readline/readline6.nix | 2 +- .../science/biology/biolib/default.nix | 2 +- .../science/math/liblbfgs/default.nix | 2 +- pkgs/development/libraries/smpeg/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 2 +- pkgs/development/libraries/soqt/default.nix | 2 +- .../development/libraries/speechd/default.nix | 2 +- pkgs/development/libraries/sword/default.nix | 2 +- pkgs/development/libraries/talloc/default.nix | 2 +- pkgs/development/libraries/tbb/default.nix | 2 +- pkgs/development/libraries/tdb/default.nix | 2 +- .../libraries/tokyo-cabinet/default.nix | 2 +- .../libraries/tokyo-tyrant/default.nix | 2 +- pkgs/development/libraries/tsocks/default.nix | 2 +- pkgs/development/libraries/ucl/default.nix | 2 +- .../development/libraries/ucommon/default.nix | 2 +- .../libraries/unixODBCDrivers/default.nix | 2 +- .../libraries/vaapi-intel/default.nix | 2 +- .../libraries/vaapi-vdpau/default.nix | 2 +- pkgs/development/libraries/vigra/default.nix | 2 +- pkgs/development/libraries/vmime/default.nix | 2 +- pkgs/development/libraries/wtk/default.nix | 2 +- pkgs/development/libraries/xapian/1.0.x.nix | 2 +- .../libraries/xapian/bindings/1.0.x.nix | 2 +- .../development/libraries/xercesc/default.nix | 2 +- pkgs/development/libraries/xmlsec/default.nix | 2 +- .../misc/avr8-burn-omat/default.nix | 2 +- .../development/misc/intelgen4asm/default.nix | 2 +- .../ocaml-modules/camlimages/default.nix | 2 +- .../ocaml-modules/cryptgps/default.nix | 2 +- .../ocaml-modules/expat/default.nix | 2 +- .../ocaml-modules/gmetadom/default.nix | 2 +- .../ocaml-modules/http/default.nix | 2 +- .../ocaml-modules/lablgl/default.nix | 2 +- .../ocaml-modules/lablgtk/default.nix | 2 +- .../ocaml-modules/lablgtkmathview/default.nix | 2 +- .../ocaml-modules/mysql/default.nix | 2 +- .../ocaml-modules/ocaml-cairo/default.nix | 2 +- .../ocaml-modules/ocamlsdl/default.nix | 2 +- .../ocaml-modules/sqlite3/default.nix | 2 +- .../ocaml-modules/ulex/0.8/default.nix | 2 +- .../ocaml-modules/ulex/default.nix | 2 +- .../Compress-Raw-Zlib/default.nix | 2 +- .../perl-modules/DBD-Pg/default.nix | 2 +- .../perl-modules/maatkit/default.nix | 2 +- .../python-modules/dbus/default.nix | 2 +- .../python-modules/pygame/default.nix | 2 +- .../python-modules/pyx/default.nix | 2 +- .../tools/analysis/lcov/default.nix | 2 +- .../tools/analysis/radare/default.nix | 2 +- .../tools/analysis/radare/ired.nix | 2 +- .../tools/analysis/valgrind/default.nix | 2 +- .../tools/analysis/valkyrie/default.nix | 2 +- .../build-managers/buildbot-slave/default.nix | 2 +- .../tools/build-managers/buildbot/default.nix | 2 +- .../build-managers/colormake/default.nix | 2 +- .../build-managers/gnumake/3.81/default.nix | 2 +- .../build-managers/gnumake/3.82/default.nix | 2 +- .../build-managers/gnumake/4.0/default.nix | 2 +- .../tools/build-managers/gradle/default.nix | 2 +- .../tools/build-managers/scons/default.nix | 2 +- .../tools/documentation/doxygen/default.nix | 2 +- .../tools/guile/g-wrap/default.nix | 2 +- .../tools/java/fastjar/default.nix | 2 +- .../tools/misc/autobuild/default.nix | 2 +- pkgs/development/tools/misc/autoconf/2.13.nix | 2 +- .../tools/misc/autoconf/default.nix | 2 +- .../tools/misc/automake/automake-1.11.x.nix | 2 +- .../tools/misc/automake/automake-1.12.x.nix | 2 +- .../tools/misc/automake/automake-1.13.x.nix | 2 +- .../tools/misc/automake/automake-1.14.x.nix | 2 +- .../tools/misc/binutils/default.nix | 2 +- .../tools/misc/cbrowser/default.nix | 2 +- pkgs/development/tools/misc/cflow/default.nix | 2 +- pkgs/development/tools/misc/cgdb/default.nix | 2 +- .../tools/misc/coccinelle/default.nix | 2 +- .../tools/misc/complexity/default.nix | 2 +- pkgs/development/tools/misc/cppi/default.nix | 2 +- pkgs/development/tools/misc/ddd/default.nix | 2 +- .../tools/misc/dejagnu/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- .../tools/misc/gengetopt/default.nix | 2 +- .../development/tools/misc/global/default.nix | 2 +- pkgs/development/tools/misc/gnum4/default.nix | 2 +- pkgs/development/tools/misc/gob2/default.nix | 2 +- pkgs/development/tools/misc/gperf/default.nix | 2 +- .../tools/misc/gtkdialog/default.nix | 2 +- .../tools/misc/help2man/default.nix | 2 +- pkgs/development/tools/misc/hydra/default.nix | 2 +- .../development/tools/misc/indent/default.nix | 2 +- .../tools/misc/inotify-tools/default.nix | 2 +- .../tools/misc/jscoverage/default.nix | 2 +- .../tools/misc/libtool/default.nix | 2 +- .../tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/misc/ninka/default.nix | 2 +- .../tools/misc/pmccabe/default.nix | 2 +- .../tools/misc/sloccount/default.nix | 2 +- .../tools/misc/stm32flash/default.nix | 2 +- .../tools/misc/sysbench/default.nix | 2 +- .../tools/misc/texi2html/default.nix | 2 +- pkgs/development/tools/misc/texinfo/4.13a.nix | 2 +- pkgs/development/tools/misc/uisp/default.nix | 2 +- .../tools/misc/usb-modeswitch/default.nix | 2 +- .../development/tools/misc/xxdiff/default.nix | 2 +- .../tools/ocaml/findlib/default.nix | 2 +- pkgs/development/tools/parsing/bison/2.x.nix | 2 +- pkgs/development/tools/parsing/bison/3.x.nix | 2 +- .../tools/parsing/ragel/default.nix | 2 +- .../tools/profiling/oprofile/default.nix | 2 +- .../tools/profiling/sysprof/default.nix | 2 +- .../tools/profiling/systemtap/default.nix | 2 +- pkgs/development/tools/pydb/default.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 2 +- pkgs/games/anki/default.nix | 2 +- pkgs/games/asc/default.nix | 2 +- pkgs/games/ball-and-paddle/default.nix | 2 +- pkgs/games/banner/default.nix | 2 +- pkgs/games/bitsnbots/default.nix | 2 +- pkgs/games/blackshadeselite/default.nix | 2 +- pkgs/games/btanks/default.nix | 2 +- pkgs/games/bzflag/default.nix | 2 +- pkgs/games/crack-attack/default.nix | 2 +- pkgs/games/crrcsim/default.nix | 3 +- pkgs/games/dhewm3/default.nix | 2 +- pkgs/games/dwarf-therapist/default.nix | 2 +- pkgs/games/egoboo/default.nix | 2 +- pkgs/games/freedink/default.nix | 2 +- pkgs/games/gav/default.nix | 2 +- pkgs/games/gltron/default.nix | 2 +- pkgs/games/gnugo/default.nix | 2 +- pkgs/games/icbm3d/default.nix | 2 +- pkgs/games/instead/default.nix | 2 +- pkgs/games/klavaro/default.nix | 2 +- pkgs/games/kobodeluxe/default.nix | 2 +- pkgs/games/minetest/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/games/njam/default.nix | 2 +- pkgs/games/oilrush/default.nix | 2 +- pkgs/games/openlierox/default.nix | 2 +- pkgs/games/openttd/default.nix | 2 +- pkgs/games/openxcom/default.nix | 2 +- pkgs/games/pioneers/default.nix | 2 +- pkgs/games/planetaryannihilation/default.nix | 2 +- pkgs/games/pong3d/default.nix | 2 +- pkgs/games/racer/default.nix | 2 +- pkgs/games/rigsofrods/default.nix | 2 +- pkgs/games/rili/default.nix | 2 +- pkgs/games/scorched3d/default.nix | 2 +- pkgs/games/simutrans/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 2 +- pkgs/games/steam/default.nix | 4 +- pkgs/games/stuntrally/default.nix | 2 +- pkgs/games/super-tux-kart/default.nix | 2 +- pkgs/games/super-tux/default.nix | 2 +- pkgs/games/teetertorture/default.nix | 2 +- pkgs/games/tennix/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 3 +- pkgs/games/tibia/default.nix | 2 +- pkgs/games/torcs/default.nix | 2 +- pkgs/games/trigger/default.nix | 2 +- pkgs/games/ufoai/default.nix | 2 +- pkgs/games/ultimatestunts/default.nix | 2 +- pkgs/games/ultrastardx/default.nix | 2 +- pkgs/games/uqm/default.nix | 2 +- pkgs/games/vdrift/default.nix | 2 +- pkgs/games/vectoroids/default.nix | 2 +- pkgs/games/zod/default.nix | 2 +- pkgs/misc/beep/default.nix | 2 +- pkgs/misc/cups/pdf-filter.nix | 2 +- .../emulators/VisualBoyAdvance/default.nix | 2 +- pkgs/misc/emulators/bsod/default.nix | 2 +- pkgs/misc/emulators/dlx/default.nix | 2 +- pkgs/misc/emulators/fakenes/default.nix | 2 +- pkgs/misc/emulators/hatari/default.nix | 2 +- pkgs/misc/emulators/mupen64plus/1.5.nix | 2 +- pkgs/misc/emulators/mupen64plus/default.nix | 2 +- pkgs/misc/emulators/uae/default.nix | 2 +- pkgs/misc/emulators/vice/default.nix | 2 +- pkgs/misc/emulators/wine/winetricks.nix | 2 +- pkgs/misc/emulators/wxmupen64plus/default.nix | 2 +- pkgs/misc/emulators/zsnes/default.nix | 2 +- pkgs/misc/foldingathome/default.nix | 2 +- pkgs/misc/freestyle/default.nix | 2 +- pkgs/misc/ghostscript/default.nix | 2 +- pkgs/os-specific/gnu/hurd/default.nix | 2 +- pkgs/os-specific/gnu/libpthread/default.nix | 2 +- pkgs/os-specific/gnu/mach/default.nix | 2 +- pkgs/os-specific/gnu/mig/default.nix | 2 +- pkgs/os-specific/gnu/smbfs/default.nix | 2 +- pkgs/os-specific/gnu/unionfs/default.nix | 2 +- pkgs/os-specific/linux/acpi/default.nix | 2 +- pkgs/os-specific/linux/acpitool/default.nix | 2 +- pkgs/os-specific/linux/afuse/default.nix | 3 +- .../linux/alsa-plugins/default.nix | 2 +- pkgs/os-specific/linux/audit/default.nix | 2 +- pkgs/os-specific/linux/autofs/autofs-v5.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- pkgs/os-specific/linux/batman-adv/default.nix | 2 +- pkgs/os-specific/linux/blcr/default.nix | 2 +- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/cryptodev/default.nix | 2 +- pkgs/os-specific/linux/cryptsetup/default.nix | 2 +- .../linux/disk-indicator/default.nix | 2 +- pkgs/os-specific/linux/dstat/default.nix | 2 +- pkgs/os-specific/linux/frandom/default.nix | 3 +- .../linux/google-authenticator/default.nix | 2 +- pkgs/os-specific/linux/hibernate/default.nix | 2 +- pkgs/os-specific/linux/hwdata/default.nix | 2 +- pkgs/os-specific/linux/i7z/default.nix | 3 +- pkgs/os-specific/linux/i810switch/default.nix | 2 +- pkgs/os-specific/linux/jujuutils/default.nix | 2 +- .../linux/kernel/manual-config.nix | 2 +- pkgs/os-specific/linux/keyutils/default.nix | 4 +- pkgs/os-specific/linux/latencytop/default.nix | 2 +- pkgs/os-specific/linux/ldm/default.nix | 2 +- pkgs/os-specific/linux/libcap-ng/default.nix | 2 +- pkgs/os-specific/linux/libsepol/default.nix | 2 +- pkgs/os-specific/linux/lsiutil/default.nix | 2 +- pkgs/os-specific/linux/net-tools/default.nix | 2 +- pkgs/os-specific/linux/netatop/default.nix | 2 +- pkgs/os-specific/linux/nfs-utils/default.nix | 2 +- .../linux/nvidia-x11/legacy173.nix | 2 +- .../linux/nvidia-x11/legacy304.nix | 2 +- pkgs/os-specific/linux/open-iscsi/default.nix | 2 +- pkgs/os-specific/linux/otpw/default.nix | 2 +- pkgs/os-specific/linux/pam_usb/default.nix | 2 +- .../os-specific/linux/pcmciautils/default.nix | 2 +- pkgs/os-specific/linux/pm-utils/default.nix | 2 +- pkgs/os-specific/linux/pmount/default.nix | 2 +- pkgs/os-specific/linux/pmtools/default.nix | 2 +- pkgs/os-specific/linux/pommed/default.nix | 2 +- pkgs/os-specific/linux/powertop/default.nix | 2 +- .../linux/psmouse-alps/default.nix | 2 +- .../os-specific/linux/radeontools/default.nix | 2 +- pkgs/os-specific/linux/setools/default.nix | 2 +- pkgs/os-specific/linux/sysstat/default.nix | 2 +- pkgs/os-specific/linux/tunctl/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/os-specific/linux/usermount/default.nix | 2 +- .../linux/xf86-input-mtrack/default.nix | 3 +- .../linux/xf86-input-multitouch/default.nix | 3 +- pkgs/os-specific/windows/jom/default.nix | 2 +- .../windows/pthread-w32/default.nix | 2 +- pkgs/servers/bird/default.nix | 2 +- pkgs/servers/elasticmq/default.nix | 2 +- .../http/apache-modules/mod_wsgi/default.nix | 2 +- pkgs/servers/http/myserver/default.nix | 2 +- pkgs/servers/mpd/clientlib.nix | 2 +- pkgs/servers/news/leafnode/default.nix | 2 +- pkgs/servers/nosql/mongodb/default.nix | 2 +- pkgs/servers/nosql/rethinkdb/default.nix | 2 +- pkgs/servers/pies/default.nix | 2 +- pkgs/servers/prayer/default.nix | 2 +- pkgs/servers/radius/default.nix | 2 +- pkgs/servers/search/elasticsearch/default.nix | 2 +- pkgs/servers/shellinabox/default.nix | 2 +- pkgs/servers/silc-server/default.nix | 2 +- pkgs/servers/sip/sipwitch/default.nix | 2 +- pkgs/servers/squid/squids.nix | 2 +- pkgs/servers/unfs3/default.nix | 2 +- pkgs/servers/xmpp/ejabberd/default.nix | 2 +- pkgs/shells/bash/default.nix | 2 +- pkgs/shells/rush/default.nix | 2 +- pkgs/tools/X11/autocutsel/default.nix | 2 +- pkgs/tools/X11/bgs/default.nix | 2 +- pkgs/tools/X11/hsetroot/default.nix | 2 +- pkgs/tools/X11/xbindkeys/default.nix | 2 +- pkgs/tools/X11/xchainkeys/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/X11/xtrace/default.nix | 2 +- pkgs/tools/admin/analog/default.nix | 2 +- pkgs/tools/admin/tigervnc/default.nix | 2 +- pkgs/tools/admin/tightvnc/default.nix | 2 +- pkgs/tools/archivers/gnutar/default.nix | 2 +- pkgs/tools/archivers/p7zip/default.nix | 2 +- pkgs/tools/archivers/sharutils/default.nix | 2 +- pkgs/tools/backup/btar/default.nix | 2 +- pkgs/tools/backup/chunksync/default.nix | 2 +- pkgs/tools/backup/duplicity/default.nix | 2 +- pkgs/tools/backup/httrack/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 2 +- pkgs/tools/backup/rsnapshot/default.nix | 2 +- pkgs/tools/bluetooth/bluedevil/default.nix | 2 +- pkgs/tools/cd-dvd/cdrkit/default.nix | 2 +- pkgs/tools/cd-dvd/unetbootin/default.nix | 2 +- pkgs/tools/cd-dvd/vobcopy/default.nix | 2 +- pkgs/tools/cd-dvd/xorriso/default.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 2 +- pkgs/tools/compression/lrzip/default.nix | 2 +- pkgs/tools/compression/rzip/default.nix | 2 +- pkgs/tools/compression/upx/default.nix | 2 +- .../filesystems/archivemount/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 2 +- pkgs/tools/filesystems/ciopfs/default.nix | 2 +- pkgs/tools/filesystems/fsfs/default.nix | 2 +- pkgs/tools/filesystems/grive/default.nix | 2 +- pkgs/tools/filesystems/httpfs/default.nix | 2 +- pkgs/tools/filesystems/mtdutils/default.nix | 2 +- .../filesystems/reiserfsprogs/default.nix | 2 +- pkgs/tools/filesystems/s3backer/default.nix | 2 +- pkgs/tools/filesystems/svnfs/default.nix | 2 +- .../tools/graphics/enblend-enfuse/default.nix | 2 +- pkgs/tools/graphics/gifsicle/default.nix | 2 +- pkgs/tools/graphics/icoutils/default.nix | 2 +- pkgs/tools/graphics/mscgen/default.nix | 2 +- pkgs/tools/graphics/panomatic/default.nix | 2 +- pkgs/tools/graphics/ploticus/default.nix | 2 +- pkgs/tools/graphics/plotutils/default.nix | 2 +- pkgs/tools/graphics/pngtoico/default.nix | 2 +- pkgs/tools/graphics/pstoedit/default.nix | 2 +- pkgs/tools/inputmethods/fcitx/default.nix | 2 +- pkgs/tools/misc/aws-mturk-clt/default.nix | 2 +- pkgs/tools/misc/bfr/default.nix | 2 +- pkgs/tools/misc/bogofilter/default.nix | 2 +- pkgs/tools/misc/coreutils/default.nix | 2 +- pkgs/tools/misc/cunit/default.nix | 3 +- pkgs/tools/misc/debian-devscripts/default.nix | 2 +- pkgs/tools/misc/debootstrap/default.nix | 2 +- pkgs/tools/misc/detox/default.nix | 2 +- pkgs/tools/misc/fasd/default.nix | 4 +- pkgs/tools/misc/fdupes/default.nix | 2 +- pkgs/tools/misc/fileschanged/default.nix | 2 +- pkgs/tools/misc/findutils/default.nix | 2 +- pkgs/tools/misc/gparted/default.nix | 2 +- pkgs/tools/misc/grub/2.0x.nix | 2 +- pkgs/tools/misc/gsmartcontrol/default.nix | 2 +- pkgs/tools/misc/hddtemp/default.nix | 2 +- pkgs/tools/misc/heimdall/default.nix | 2 +- pkgs/tools/misc/idutils/default.nix | 2 +- pkgs/tools/misc/jdiskreport/default.nix | 2 +- pkgs/tools/misc/kermit/default.nix | 2 +- pkgs/tools/misc/keychain/default.nix | 2 +- pkgs/tools/misc/lockfile-progs/default.nix | 2 +- pkgs/tools/misc/mc/default.nix | 2 +- pkgs/tools/misc/mcrypt/default.nix | 2 +- pkgs/tools/misc/megacli/default.nix | 2 +- pkgs/tools/misc/mktorrent/default.nix | 2 +- pkgs/tools/misc/most/default.nix | 2 +- pkgs/tools/misc/mssys/default.nix | 2 +- pkgs/tools/misc/mysql2pgsql/default.nix | 2 +- pkgs/tools/misc/pal/default.nix | 2 +- pkgs/tools/misc/parallel/default.nix | 2 +- pkgs/tools/misc/parcellite/default.nix | 2 +- pkgs/tools/misc/parted/default.nix | 2 +- pkgs/tools/misc/partition-manager/default.nix | 2 +- pkgs/tools/misc/picocom/default.nix | 2 +- pkgs/tools/misc/pk2cmd/default.nix | 2 +- pkgs/tools/misc/ponysay/default.nix | 2 +- pkgs/tools/misc/proxytunnel/default.nix | 2 +- pkgs/tools/misc/pv/default.nix | 2 +- pkgs/tools/misc/recutils/default.nix | 2 +- pkgs/tools/misc/remind/default.nix | 2 +- pkgs/tools/misc/rrdtool/default.nix | 2 +- pkgs/tools/misc/sl/default.nix | 2 +- pkgs/tools/misc/slsnif/default.nix | 2 +- pkgs/tools/misc/stow/default.nix | 2 +- pkgs/tools/misc/t1utils/default.nix | 2 +- pkgs/tools/misc/testdisk/default.nix | 2 +- pkgs/tools/misc/time/default.nix | 2 +- pkgs/tools/misc/uucp/default.nix | 2 +- pkgs/tools/misc/wv2/default.nix | 2 +- pkgs/tools/misc/xburst-tools/default.nix | 2 +- pkgs/tools/misc/xclip/default.nix | 2 +- pkgs/tools/misc/xdaliclock/default.nix | 3 +- pkgs/tools/networking/ahcpd/default.nix | 2 +- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/babeld/default.nix | 2 +- pkgs/tools/networking/dropbear/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/networking/flvstreamer/default.nix | 2 +- pkgs/tools/networking/gftp/default.nix | 2 +- pkgs/tools/networking/hyenae/default.nix | 2 +- pkgs/tools/networking/imapproxy/default.nix | 2 +- pkgs/tools/networking/imapsync/default.nix | 2 +- pkgs/tools/networking/inadyn/default.nix | 2 +- pkgs/tools/networking/inetutils/default.nix | 2 +- pkgs/tools/networking/jnettop/default.nix | 2 +- pkgs/tools/networking/lsh/default.nix | 2 +- pkgs/tools/networking/megatools/default.nix | 2 +- pkgs/tools/networking/mosh/default.nix | 2 +- pkgs/tools/networking/mu/default.nix | 2 +- pkgs/tools/networking/nbd/default.nix | 2 +- pkgs/tools/networking/netkit/tftp/default.nix | 2 +- pkgs/tools/networking/ngrep/default.nix | 2 +- pkgs/tools/networking/nss-mdns/default.nix | 2 +- pkgs/tools/networking/ntop/default.nix | 2 +- pkgs/tools/networking/nzbget/default.nix | 2 +- pkgs/tools/networking/openresolv/default.nix | 2 +- pkgs/tools/networking/openssh/default.nix | 2 +- pkgs/tools/networking/openvpn/default.nix | 2 +- pkgs/tools/networking/p2p/amule/default.nix | 2 +- pkgs/tools/networking/p2p/seeks/default.nix | 2 +- pkgs/tools/networking/pdnsd/default.nix | 2 +- pkgs/tools/networking/pdsh/default.nix | 2 +- pkgs/tools/networking/proxychains/default.nix | 2 +- pkgs/tools/networking/pwnat/default.nix | 2 +- pkgs/tools/networking/reaver-wps/default.nix | 2 +- pkgs/tools/networking/s3sync/default.nix | 2 +- .../tools/networking/smbldaptools/default.nix | 2 +- pkgs/tools/networking/swec/default.nix | 2 +- pkgs/tools/networking/udptunnel/default.nix | 2 +- pkgs/tools/networking/uwimap/default.nix | 2 +- pkgs/tools/networking/vpnc/default.nix | 2 +- pkgs/tools/networking/vtun/default.nix | 2 +- pkgs/tools/networking/wakelan/default.nix | 2 +- pkgs/tools/networking/wget/default.nix | 2 +- .../disnix/DisnixWebService/default.nix | 2 +- .../package-management/disnix/default.nix | 2 +- .../disnix/disnixos/default.nix | 2 +- .../disnix/dysnomia/default.nix | 2 +- .../tools/package-management/guix/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- .../tools/package-management/nix/unstable.nix | 2 +- pkgs/tools/security/aespipe/default.nix | 2 +- pkgs/tools/security/ccid/default.nix | 2 +- pkgs/tools/security/ccrypt/default.nix | 2 +- pkgs/tools/security/gnupg/git.nix | 2 +- pkgs/tools/security/gnupg1/default.nix | 2 +- pkgs/tools/security/meo/default.nix | 2 +- pkgs/tools/security/muscletool/default.nix | 2 +- pkgs/tools/security/pinentry/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/security/tor/torsocks.nix | 2 +- pkgs/tools/system/acct/default.nix | 2 +- pkgs/tools/system/at/default.nix | 2 +- pkgs/tools/system/collectd/default.nix | 2 +- pkgs/tools/system/ddrescue/default.nix | 2 +- pkgs/tools/system/efibootmgr/default.nix | 1 - pkgs/tools/system/fakeroot/default.nix | 2 +- pkgs/tools/system/fcron/default.nix | 2 +- pkgs/tools/system/fdisk/default.nix | 2 +- pkgs/tools/system/fio/default.nix | 2 +- pkgs/tools/system/freeipmi/default.nix | 2 +- pkgs/tools/system/gptfdisk/default.nix | 3 +- pkgs/tools/system/gt5/default.nix | 2 +- pkgs/tools/system/idle3tools/default.nix | 2 +- pkgs/tools/system/logcheck/default.nix | 2 +- pkgs/tools/system/logrotate/default.nix | 2 +- pkgs/tools/system/mcron/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 2 +- pkgs/tools/system/safecopy/default.nix | 2 +- pkgs/tools/system/storebrowse/default.nix | 2 +- pkgs/tools/system/syslog-ng/default.nix | 2 +- pkgs/tools/system/tree/default.nix | 2 +- pkgs/tools/text/catdoc/default.nix | 2 +- pkgs/tools/text/convertlit/default.nix | 2 +- pkgs/tools/text/dos2unix/default.nix | 2 +- pkgs/tools/text/enca/default.nix | 2 +- pkgs/tools/text/enscript/default.nix | 2 +- pkgs/tools/text/gawk/default.nix | 2 +- pkgs/tools/text/gnugrep/default.nix | 2 +- pkgs/tools/text/gnupatch/default.nix | 2 +- pkgs/tools/text/gnused/default.nix | 2 +- pkgs/tools/text/groff/default.nix | 2 +- pkgs/tools/text/html-tidy/default.nix | 2 +- pkgs/tools/text/kdiff3/default.nix | 2 +- pkgs/tools/text/mairix/default.nix | 2 +- pkgs/tools/text/multitran/data/default.nix | 2 +- .../tools/text/multitran/libbtree/default.nix | 2 +- .../tools/text/multitran/libfacet/default.nix | 2 +- .../text/multitran/libmtquery/default.nix | 2 +- .../text/multitran/libmtsupport/default.nix | 2 +- pkgs/tools/text/multitran/mtutils/default.nix | 2 +- pkgs/tools/text/namazu/default.nix | 2 +- pkgs/tools/text/qshowdiff/default.nix | 2 +- pkgs/tools/text/sgml/openjade/default.nix | 2 +- pkgs/tools/text/sgml/opensp/default.nix | 2 +- pkgs/tools/text/source-highlight/default.nix | 2 +- pkgs/tools/text/uni2ascii/default.nix | 2 +- pkgs/tools/text/wdiff/default.nix | 2 +- .../tools/text/xml/html-xml-utils/default.nix | 2 +- pkgs/tools/text/xml/rxp/default.nix | 2 +- pkgs/tools/text/xml/xmlstarlet/default.nix | 2 +- pkgs/tools/typesetting/biber/default.nix | 2 +- pkgs/tools/typesetting/docbook2x/default.nix | 2 +- pkgs/tools/typesetting/halibut/default.nix | 2 +- pkgs/tools/typesetting/lhs2tex/default.nix | 2 +- pkgs/tools/typesetting/lout/default.nix | 2 +- pkgs/tools/typesetting/pdftk/default.nix | 2 +- pkgs/tools/typesetting/rubber/default.nix | 2 +- .../tools/typesetting/tex/dblatex/default.nix | 2 +- pkgs/tools/typesetting/tex/tex4ht/default.nix | 2 +- pkgs/tools/typesetting/xmlto/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- pkgs/tools/video/swfmill/default.nix | 3 +- pkgs/tools/video/swftools/default.nix | 2 +- pkgs/tools/virtualization/aws/default.nix | 2 +- .../virtualization/ec2-ami-tools/default.nix | 2 +- .../virtualization/ec2-api-tools/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 750 +++++++++--------- pkgs/top-level/python-packages-generated.nix | 339 ++++---- pkgs/top-level/python-packages.nix | 40 +- 1010 files changed, 1578 insertions(+), 1619 deletions(-) diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 031b0fe93b59..1978fcf18749 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -61,7 +61,7 @@ in meta = { homepage = "http://lly.org/~rcw/abcde/page/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command-line audio CD ripper"; longDescription = '' diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 890497b0c992..7308d84e0984 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor with graphical UI"; homepage = http://audacity.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 1e19a3ac5c39..41edd51e5f26 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { the command line or a script. ''; homepage = http://www.jpj.net/~trevor/aumix.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index c67830a94e77..1646f944a830 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -19,7 +19,7 @@ in meta = { homepage = http://lly.org/~rcw/cd-discid/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID"; longDescription = '' diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index d47d82497ab6..0faf4841c71b 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compact open source software speech synthesizer"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 0e59a42614fd..524a95bcca06 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Phoneme editor for espeak"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index e75be3e2c2be..f23ba66a3b51 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://wejp.k.vu/projects/gmu; description = "Open source music player for portable gaming consoles and handhelds"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 90e27c12ce3b..95a602312970 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index a7835f020d14..b96872c7ef0c 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 8557bc31c445..74d98184d9dd 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; homepage = http://www.aelius.com/njh/jackmeter/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 4b8ba4dbc242..4b07c84b0be8 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Not a Guitar-Only tuner"; homepage = http://www.nongnu.org/lingot/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index a86e09278c3c..f38ff4697313 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d5a8138a5001..0f33726eaeed 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = http://www.ibiblio.org/mp3info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index ae6d9e0c7e60..54ae5476efdd 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.algorith ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 2f00638961c3..cd4343b1beb4 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "mpc123, a Musepack (.mpc) audio player"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ffec1a5736c3..e58397350cb1 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "mpg321, a command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 02a27bedb67f..ca08624e98f3 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b8a283125fc4..4859377ab52a 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; - license = "GPLv2+"; # Has some 3rd-party code in it though + license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59bea8fc1944..b823ef02ef8f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; description = "Spotify for Linux allows you to play music from the Spotify music service"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 5db7cc30cf8c..e4e5b7ff81a3 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 84b810bf4602..e598fa19c5ea 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Hex editor with vim style keybindings"; homepage = http://bvi.sourceforge.net/download.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 88b539d29f5f..d3e9a4c46794 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { full-screen editors such as GNU Emacs or GNU Moe. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ed/; diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix index 75f484d295b5..40f172316efc 100644 --- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix +++ b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 8934238ffa3a..83c9ddebe818 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A calendar framework for Emacs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 779fc8a146e1..e350dc08e71c 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Development Environment), and COGRE (COnnected GRaph Editor). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://cedet.sourceforge.net/; }; diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix index a0ba61431655..495b1aca4b53 100644 --- a/pkgs/applications/editors/emacs-modes/coffee/default.nix +++ b/pkgs/applications/editors/emacs-modes/coffee/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for CoffeeScript, unfancy JavaScript"; homepage = https://github.com/defunkt/coffee-mode; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix index bad277d61ce3..a3d76a307c74 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs-lisp mode for skinning your Emacs"; homepage = http://www.nongnu.org/color-theme; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix index cf2bcc6e30b9..349146dbdd89 100644 --- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/darcsum/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A pcl-cvs like interface for managing darcs patches."; homepage = "http://hub.darcs.net/simon/darcsum"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.falsifian ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix index 33f0299f5f00..807bb91f850c 100644 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { navigation and overview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecb.sourceforge.net/; diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index b23c6da6123c..9a84fbb77483 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -20,7 +20,6 @@ clangStdenv.mkDerivation { meta = { homepage = "https://github.com/Golevka/emacs-clang-complete-async"; description = "An emacs plugin to complete C and C++ code using libclang"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } - diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 3ba848affc0d..26f313f038df 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { developed a simple Emacs interface to w3m. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://emacs-w3m.namazu.org/; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index d8bbb83c4e58..078907d7bb59 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/emms/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix index 28773e97c409..dca84a7936d7 100644 --- a/pkgs/applications/editors/emacs-modes/gh/default.nix +++ b/pkgs/applications/editors/emacs-modes/gh/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A (very early) GitHub client library for Emacs"; homepage = https://github.com/sigma/gh.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix index 21a2137dd392..08471247f081 100644 --- a/pkgs/applications/editors/emacs-modes/gist/default.nix +++ b/pkgs/applications/editors/emacs-modes/gist/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs integration for gist.github.com"; homepage = https://github.com/sigma/gist.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 614a37030510..28375dcb68df 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for Idris"; homepage = https://github.com/idris-hackers/idris-mode; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix index ab0e3512ef28..925fa54c735f 100644 --- a/pkgs/applications/editors/emacs-modes/jade/default.nix +++ b/pkgs/applications/editors/emacs-modes/jade/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; homepage = https://github.com/brianc/jade-mode; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 89d908826b1c..4c347f27e681 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -89,7 +89,7 @@ in * Java source interpreter (Pat Neimeyer's BeanShell) ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix index 09161ec80678..a47f04472ec7 100644 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "tiny logging framework for Emacs"; homepage = https://github.com/sigma/logito; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix index 72086e54fece..b75c51d3bd74 100644 --- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Insert dummy pseudo Latin text for Emacs"; homepage = http://www.emacswiki.org/emacs/LoremIpsum; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 4e2601cc106c..076caf5235b2 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/magit/magit"; description = "Magit, an Emacs interface to Git"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' With Magit, you can inspect and modify your Git repositories with diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index b6b043fb7b8d..57c2b2890be7 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Emacs mode for the programming language Maude"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix index 2a35c6ef6950..77bfedf62748 100644 --- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "an emacs library to access metaweblog based weblogs"; homepage = https://github.com/punchagan/metaweblog; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index ba2437f1a2b8..f55fe564ef3d 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { than that found in GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix index d2e9e305bffb..5c1aec7e02b7 100644 --- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Publish directly from Emacs’ org-mode to WordPress blogs"; homepage = https://github.com/punchagan/org2blog; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix index c0aa07726788..f4dcf03dee84 100644 --- a/pkgs/applications/editors/emacs-modes/pcache/default.nix +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Persistent caching for Emacs"; homepage = https://github.com/sigma/pcache.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix index 0dea1a13977e..c026d058b4e3 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { s|/sbin/install-info|install-info|g" - # Workaround for bug #458 + # Workaround for bug #458 # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 sed -i "Makefile" \ @@ -48,7 +48,7 @@ stdenv.mkDerivation (rec { interactive theorem provers), based on the customizable text editor Emacs. ''; homepage = http://proofgeneral.inf.ed.ac.uk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }) diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index bef1ebe5859b..95634a24ded4 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Enhanced Emacs support for editing and running Scheme code"; homepage = http://www.neilvandyke.org/quack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 896dbdac71be..1f218439a5ff 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Mark a rectangle of text with highlighting"; homepage = http://emacswiki.org/emacs/RectangleMark; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/remember/default.nix b/pkgs/applications/editors/emacs-modes/remember/default.nix index ea17a9b792ae..7c0bc517755a 100644 --- a/pkgs/applications/editors/emacs-modes/remember/default.nix +++ b/pkgs/applications/editors/emacs-modes/remember/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gna.org/projects/remember-el/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index e942189714ea..aa27e302e5d6 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; homepage = http://www.emacswiki.org/emacs/Sunrise_Commander; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index c6563605464a..d196c3fee804 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { homepage = https://github.com/bnbeckwith/writegood-mode; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix index cee0f0ca5534..661430516b70 100644 --- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix +++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Elisp implementation of clientside XML-RPC"; homepage = https://launchpad.net/xml-rpc-el; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index a18bfd8b2c65..d9f62216fac9 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "WYSIWYG PostScript annotator"; homepage = "http://http://flpsed.org/flpsed.html"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 4d48ba69086e..5ef198745312 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index c7867ce22af2..0c967e05ba11 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 088d76f48687..3ef557cef4b3 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,6 @@ in stdenv.mkDerivation { meta = { description = "Sophisticated text editor for code, markup and prose"; maintainers = stdenv.lib.maintainers.wmertens; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } - diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 1c6d86a2f3da..ce863312251c 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { collaborative authoring are planned for later. ''; homepage = http://texmacs.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 4166bc1e9e3e..32d30cd47450 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/zile/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index be3cfc5935c7..6d26dafae623 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 68910e67e25a..2796a5535a03 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = http://comical.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index f832513a8241..4ded807cb29a 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "A new portable DjVu viewer and browser plugin"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; inherit (qt4.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 44ca66ac5b9d..b170b784aaa4 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { initially based on GQview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://geeqie.sourceforge.net; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3810006103df..7139bc71f3c1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -236,7 +236,7 @@ rec { homepage = http://lensfun.sebastiankraft.net/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 8b2c45398d9e..2e9d55a3f3f2 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 15a8ab713dba..919b9fcc4c3c 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a9ff7ef25c32..a98e60d6fea0 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index df50dd5bd793..53df14f8704f 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; homepage = http://ipe7.sourceforge.net; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 7629c57a2b86..c997f5c343fd 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = http://mcomix.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 4e2075ff4714..9352ae092be4 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; homepage = http://meshlab.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index e3c6deddb295..e354837f4b87 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "Black-and-white djvu page encoder and decoder that use interpage information"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index def22804bb65..20f7460f7a16 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = http://mirageiv.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 482b57d03d2d..4c20a41061ae 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { backend to other programs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 17e1b2e8b146..8e5204ac6382 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://panotools.sourceforge.net/; description = "Free software suite for authoring and displaying virtual reality panoramas"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b54d73b4964f..6958c94f7e18 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 365f88b19b4c..f58fe0e28c1d 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 95d7acca36c5..cd8c76dc42cf 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { aims to provide a workflow for high dynamic range (HDR) imaging. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 3d95dcd81ee8..28d2f1e200b2 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 9e73a08e0967..a0f6e5bac509 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 7b1ffb1f2be4..221a4340dce2 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 83f3c7510298..083fde359029 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 8500fa9faba2..30513577d04b 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index e67d202dcae6..eaf6dd4ba248 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = http://code.google.com/p/tesseract-ocr/; - license = "Apache2.0"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 070244d67d2c..783832abd003 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { the camera's tone curves. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # needs GTK+ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index aa09fb705f1c..dd8e01298ff4 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { in mind (follows Gnome HIG2). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://xsisqox.github.com/Viewnior; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index cddbc212c190..88c189d9bbbe 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -29,6 +29,6 @@ rec { meta = { homepage = http://xaos.sourceforge.net/; description = "XaoS - fractal viewer"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 3d187d92f5c6..77e48e49dd89 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index a186f5f5ee0d..85bc89f77559 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index a8dd26ab6095..73cdbb37616a 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; homepage = http://soxr.sourceforge.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index cdaeb49f14c6..1976ea5ce135 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A Qt4 Bible study tool"; homepage = http://www.bibletime.info/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr ]; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 118b56c55b07..1a25a233c0de 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.bitcoin.org/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 4eb4c441c99d..ce53045a15a9 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3fecddcb316c..1ba3ee5268f7 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "a generic, highly customizable, and efficient menu for the X Window System"; homepage = http://tools.suckless.org/dmenu; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; } - diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 6941e8df626a..d79162289c3c 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { GTK+ libraries. The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index b070b629282c..5ad82c9239c8 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index f2dadd2e5e8b..638f254364e8 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for input event debugging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 33d8585bb2dd..65265fc07a5a 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Peer-to-peer currency with demurrage fee"; homepage = "http://freicoi.in/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 3b8f8b1cc680..81f74847c2f0 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 08b868bca926..ea577beb5929 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { meta = { description = "A world sphere viewer"; homepage = http://earth.google.com; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 29d5b1ee7cc8..bf44f91056d7 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { homepage = http://www.gpsbabel.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 141476a6b406..9a59329871e6 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { one takes the GPS data in a different format. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://freefoote.dview.net/linux_gpscorr.html; }; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 0c2b957bc7ca..39621536e688 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK+-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index efd9cf263e7c..4867bef1f719 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { interface for the Ghostscript interpreter. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix index befa8d252100..e8274418ae16 100644 --- a/pkgs/applications/misc/htmldoc/default.nix +++ b/pkgs/applications/misc/htmldoc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.htmldoc.org/; description = "Converts HTML files to indexed HTML, PS or PDF"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index b347f971ee0f..fab492d5c099 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fe4c0287fdd2..d722367d1b49 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix index 2f140db93973..59d25a980404 100644 --- a/pkgs/applications/misc/librecad/2.0.nix +++ b/pkgs/applications/misc/librecad/2.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index b225519f4868..be3fa4128b66 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 1ea4f06c9273..36b2f84aab54 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = "http://www.lyx.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.vcunat ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e6636415b5ef..932e5bb48300 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric urkud]; inherit (qt4.meta) platforms; }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a56460827f50..aa7c14634d13 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://mupdf.com/; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF viewer and toolkit written in portable C"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; inherit version; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index a526774d48ec..6d990831a369 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index ef1e777f55fd..1be39c666421 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.navit-project.org/; description = "Car navigation system with routing engine using OSM maps"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 74f657ee02a7..8a68bd7ccfb9 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "open source Geographic Information System (GIS) written in the Java programming language"; homepage = http://www.openjump.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index d6711c82968e..cc26a74802b4 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 88d6e7a7cf94..abf55aa22b97 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.linux; maintainers = maintainers.mornfall; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index e1492a476914..151b8a077d5d 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { terminals in one window and adds a contextual menu with some basic options. No more no less. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9c57fbd19a77..1dcdf78456d2 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with maintainers; [viric]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 9eb3e1123421..1ca8ec045d61 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "stardict"; homepage = "A international dictionary supporting fuzzy and glob style matching"; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; } - diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 651cfcca4067..983fbde0c459 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { surf to another URI by setting its XProperties. ''; homepage = http://surf.suckless.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 609849166d16..aa1df2c9d1a6 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 77acc511fe42..e1e047714603 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.taskjuggler.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' TaskJuggler is a modern and powerful, Open Source project management diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix index e16767d4c261..720240d0d797 100644 --- a/pkgs/applications/misc/vanitygen/default.nix +++ b/pkgs/applications/misc/vanitygen/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { and will run about 30% faster. ''; homepage = "https://github.com/samr7/vanitygen"; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 70ac055db098..6508b12e1de8 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = http://viking.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 417d4a5ae683..0f71a53075f9 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; homepage = "http://tools.suckless.org/wmname"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 9b1385d9d6ad..9a35cef08243 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "http://sourceforge.net/projects/xfe/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 4f6e3342f588..cc08436fa033 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; homepage = http://xneur.ru; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 61db2656a409..0e4fd4db1ba8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 617d307b7835..d39dfe3582e9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; maintainers = with stdenv.lib.maintainers; [ wizeman ]; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index e1bc4e977f6a..afe0600d6f7e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.google.com/chat/video/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index cf01a3c6d5f5..07184bfd9f2c 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -42,7 +42,7 @@ rec { meta = { description = "HTML5 compliant parsing library, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; @@ -63,7 +63,7 @@ rec { meta = { description = "implementation of the W3C DOM, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix index 7ad39ee4ec9c..ede053aeca3f 100644 --- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix +++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libcss/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index fec93c39ab9d..32bede76e432 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibParserUtils is a library for building efficient parsers, written in C"; homepage = http://www.netsurf-browser.org/projects/libparserutils/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 462d532cb9c4..9c16ff9b89c5 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsbmp/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 5894e5c1c033..a4502d2354de 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsgif/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index a90e6fa193cd..300e9965092d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "implementation of SVG Tiny, written in C"; homepage = http://www.netsurf-browser.org/projects/libsvgtiny/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index c4e4a60fbd68..8d19d1c1ef24 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibWapcaplet is a string internment library, written in C"; homepage = http://www.netsurf-browser.org/projects/libwapcaplet/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 92175bb23e9c..36571809a370 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index b674f3a83fb2..858e99c245ba 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 457d3441b3ab..ec614bf4b8c1 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.bitlbee.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index d746d54974af..54e2d813be8a 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.centerim.org/; description = "Fork of CenterICQ, a curses instant messaging program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 68973b4e47f5..64021c93bc83 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = http://gtmess.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 4e176ec56dcb..be24878259fb 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; homepage = http://www.kadu.net/w/English:Main_Page; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c3af0ad0e340..be12c7e8e2ae 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index cf42dd5700ba..7cbc38ea0dc0 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cypherpunks.ca/otr; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 544aa06877ad..6402e7154de4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/novas0x2a/skype4pidgin; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index b87db662f45e..348802fe16eb 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://tox.dhs.org/; description = "Tox plugin for Pidgin / libpurple"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index a31a682abf88..fb14782ef9f6 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -14,7 +14,7 @@ let meta = { homepage = http://sflphone.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Free software enterprise-class softphone for GNU/Linux"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index a4035604168f..4ce098e6ca46 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 2fa82e1251bc..713aa8f03744 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://atdot.ch/scr/; description = "Open source tool to record your Skype calls on Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index f1ac10639344..32755306cc76 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { meta = { description = "A proprietary voice-over-IP (VoIP) client"; homepage = http://www.skype.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 51639f6050dc..b0302ba8e0bf 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface for Telegram messenger"; homepage = https://telegram.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index ded2bbf92500..4527d981a9f0 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference CLI for Tox"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index f0a6dbbe7e77..db1f2011f113 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://iptraf.seul.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 537897c13b4a..224f639cc150 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tools.suckless.org/ii/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 98d5afa0ba9f..eb21f34838e7 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/falsovsky/FiSH-irssi; - license = "unfree"; # I can't find any mention of license + license = stdenv.lib.licenses.unfree; # I can't find any mention of license maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 988320dd61fc..4841aa8070e0 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/cryptodotis/irssi-otr; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 2a5be53619d7..432dbddb97c0 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -55,10 +55,9 @@ in with stdenv; mkDerivation rec { combination of screen and a text-based IRC client such as WeeChat, but graphical (based on Qt4/KDE4). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom ]; repositories.git = https://github.com/quassel/quassel.git; inherit (qt4.meta) platforms; }; } - diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dbd5a41afd34..9c397f27c46f 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -55,9 +55,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ the-kenny ]; }; } - diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 4c74c2c32de0..013694d259cb 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = https://freenetproject.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index bcd0eb503f60..6c28840f7e5f 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index ed6c348706b9..25a51b3c9365 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5fa19c71d9a1..5bc228f9a6b9 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 558394199f45..4d08e1cc60a1 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "SIP stack and media stack for presence, im, and multimedia communication"; homepage = http://pjsip.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 24bc20af6528..8fb929d53e10 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; description = "Remmina is a remote desktop client written in GTK+"; maintainers = []; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 619925354f06..f142395aa57b 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "VNC viewer that adds encryption security to VNC connections"; homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 440eb90390ae..459ae9fab82b 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 6802782bcb5d..65ddd7305c83 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index a51f65cbccb0..f5104665562d 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://etherape.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 744c8c01efa5..4ac5e8300ca8 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; description = "Bidirectional file synchronizer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 57afefd7dcdd..6d4306044a41 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://humdi.net/vnstat/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 752a7824e6f0..2e60b9aa3228 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://www.yafc-ftp.com; maintainers = [ stdenv.lib.maintainers.page ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index f126d6bfba65..c260220aad4d 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Incidences can be filtered, added, edited, deleted via context menu. ''; homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ee0475d45ec0..9c255f493d3f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { accounting principles to ensure balanced books and accurate reports. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnucash.org/; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 014aa5bf0fd2..2b2fd87cf430 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://projects.gnome.org/gnumeric/; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 5e5c98e82601..007e093378da 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index de6517923b6e..fad2167fb7ac 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -71,7 +71,7 @@ in homepage = http://impressive.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 419d761b0959..409da36b2640 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -17,6 +17,6 @@ buildPythonPackage { meta = { description = "Note taking application"; homepage = http://rasm.ods.org/keepnote; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index d56f4bed0ce9..2940569ef659 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -28,7 +28,7 @@ in meta = { description = "Easy-to-use personal finance software"; homepage = http://www.codelathe.com/mmex; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 250ce163e4f5..4026031de084 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = http://www.scribus.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index a2cc07b0a61c..696890f95f1e 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; description = "A beautiful OpenGL-based gravity simulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index fa6dcaa82ede..4396ab463c6d 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; - license = "GNUv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 142519c30ed5..a6a5f68755a4 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; homepage = http://www.gnu.org/software/archimedes; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index d135fb094345..404ffc5010b4 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = http://caneda.tuxfamily.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 0bc6b60e7210..c761f6196424 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Wave viewer for Unix and Win32"; homepage = http://gtkwave.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0e81616a0069..1fc97abef927 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software EDA Suite"; homepage = "http://www.kicad-pcb.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index e434c97db2b0..dd3eaecc7441 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; homepage = http://qucs.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 1feac0b31c17..30e882a7f38e 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix index 25c6a309cf37..108986ddefe4 100644 --- a/pkgs/applications/science/electronics/tkgate/2.x.nix +++ b/pkgs/applications/science/electronics/tkgate/2.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; broken = true; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index f2c9d2e646f0..e68d2a4ab91a 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Icarus Verilog compiler"; repositories.git = https://github.com/steveicarus/iverilog.git; homepage = http://www.icarus.com; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [winden]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 54aae9e7d3bf..df7d053d93bd 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; homepage = http://xoscope.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index d14fa08bbb57..ddfb92def958 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 2fb9678b8329..b1f48fdf04b9 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -47,7 +47,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; passthru = { updateInfo = { @@ -55,4 +55,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index ab46efa9a961..c71ed73a9925 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix index f77e9d34a2a8..9e98c8db3947 100644 --- a/pkgs/applications/science/logic/matita/130312.nix +++ b/pkgs/applications/science/logic/matita/130312.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 0713ff09e929..f601f97de62e 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 1f29b3aa1a11..f8b4fc73100f 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "MIT"; + license = stdenv.lib.licenses.mit; homepage = "http://minisat.se/"; }; passthru = { @@ -54,4 +54,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 430537fd57ff..065d1dd9e02c 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -39,7 +39,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = "http://code.google.com/p/opensmt/"; }; passthru = { @@ -48,4 +48,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 970daf739fca..6c2cce0ea4b1 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fmv.jku.at/picosat/; description = "SAT solver with proof and core support"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 55ea4c6216c6..fdf5c1bd8315 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Eukleides is a computer language devoted to elementary plane diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index f76640567f60..49a46e0c8b27 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -60,8 +60,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://gap-system.org/"; }; }) x - diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 997080ee303c..d4d352c95bbb 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 7123b476f356..096796a859d0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Maxima computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maxima is a fairly complete computer algebra system written in diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 5c5dfae8200f..f4b3447e3b61 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; # Or GPLv2 at your option - but not GPLv4 + license = stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; }; passthru = { @@ -58,4 +58,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 8471c46c8d75..66609fa58341 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 01be4ba7e6c6..75448b6965cd 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform GUI for the computer algebra system Maxima"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://wxmaxima.sourceforge.net; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index acc4740eb6b4..2c9d63be1b4d 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Easy to use, general purpose Computer Algebra System"; homepage = http://yacas.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index f4b79c8d236f..7020de0bca88 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://boinc.berkeley.edu/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a380f05b0915..c0b7936edea7 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -35,7 +35,6 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; }) x - diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5fdede1abcdf..d402a48c815c 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = http://simgrid.gforge.inria.fr/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index e58183a4f40b..da6e0cb2805d 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://tulip.labri.fr/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index a6b3ac7ccfdf..3a9df1505742 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 1be797fea966..9bc4401e0681 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 d92b49b9ef6c..a7e6a62ce5f5 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 c3b3469ca1ad..590e090de48c 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 5290a12a54ac..195f6f3a4635 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 73b21728e165..29094f1efce4 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 5fdafe8ac2aa..fb3e115e125f 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 e89cea6aadce..29fafc4db74c 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 264340b48262..843fe9ad3230 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 90bca9b07124..e71d23132aca 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 569c442f9838..b3bfe8a22e68 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; }; } diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 70dcad49c978..a9a2ec46397f 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/avxsynth/avxsynth/wiki; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 1058243c0e08..f962b52dd627 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { media collection management, playlists and statistics. ''; homepage = http://bangarangkde.wordpress.com/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index ce8bbde2ecd1..8287cb9121ea 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index f4be54ae23ec..e3c288534035 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 74e3d58553a7..5e8e63564f4f 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "Linux DVB API applications and utilities"; homepage = http://linuxtv.org/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 2e8b7e63cb82..06122619066a 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { supports most SWF v7 features and some SWF v8 and v9. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 30e0bdfb197a..16bd57bef34a 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { meta = { description = "Kino is a non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 1b3acd2c2ff3..6e7b874841fc 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; homepage = http://sourceforge.net/projects/lxdvdrip; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 43482bd97624..bec9d85aefd8 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { can always download the latest version from makemkv.com that will reset the expiration date. ''; - license = "unfree"; + license = stdenv.lib.licenses.unfree; homepage = http://makemkv.com; }; } diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 6a385786eff3..f3cef6db69f1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -72,7 +72,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index f0830f007d91..d8ada6372b10 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -60,7 +60,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats (MPlayer fork)"; homepage = "http://mplayer2.org"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 11a16e3a79d2..82077e4d3ddd 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { tool for extracting chapter information from DVD. ''; homepage = http://www.bunkus.org/videotools/ogmtools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index b3880067cac4..811fb7a78dbf 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/huceke/omxplayer; description = "Commandline OMX player for the Raspberry Pi"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 807e3954d6fe..29bb439dcf66 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 9d7f8a6ac992..83b5c778f866 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 84600884e7b6..8e2da5c3b764 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://virt-manager.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; }; diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index b21f73ddc549..3db2bde6540d 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://awesome.naquadah.org/; description = "Highly configurable, dynamic window manager for X"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index b69dd9d8a492..626a0926a676 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "www.suckless.org"; description = "Dynamic window manager for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 33acd0002705..6830e3a1c010 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index ed2637eff6e5..08c1be9f963d 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 56a5f0e3e2ce..fad5b8010ea4 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index d1419fc22258..65264c20db35 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; description = "Ratpoison, a simple mouse-free tiling window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Ratpoison is a simple window manager with no fat library diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 92f617888921..e1d9e1614f38 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/freefont/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index e216f4b0278d..db4d13b890fd 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/miscfiles/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; }; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 30c8bf07d418..5932caf9e97d 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix index 371382b2607d..045f60e8b606 100644 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GConf"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 55f0e0ae1a3b..ee08975b9daa 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { OpenGL drawing for standard and custom GTK+ widgets. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 46218c8f601b..4ce51844a51e 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GtkGLExt"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix index 4b50840534cf..76cfacb0d776 100644 --- a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix index 12518c634c4f..47b958002a39 100644 --- a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix index c916be6c9a72..b9ffcffafbdc 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.35"; versionMinor = "90"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix index 0390fc133687..fd16d2d4985f 100644 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index ca983258d956..2a585d78f4e5 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix index 12518c634c4f..47b958002a39 100644 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 70c860849e08..41597e47fa54 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.36"; versionMinor = "2"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix index 0390fc133687..fd16d2d4985f 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix index 63bfa12c4bb4..f5b74af1a8dd 100644 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ b/pkgs/desktops/kde-4.12/applications/kate.nix @@ -6,6 +6,6 @@ kde { meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix index 0db47fb2d7c4..5fd745644468 100644 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ b/pkgs/desktops/kde-4.12/applications/konsole.nix @@ -6,6 +6,6 @@ kde { meta = { description = "Konsole, the KDE terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix index c2a256646786..6d22fc425f5f 100644 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix @@ -6,6 +6,6 @@ kde { meta = { description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 39e9c10a0fbe..9e4e8eaad051 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -41,6 +41,6 @@ kde { meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix index a80574ff67ab..6646718ddc96 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix @@ -8,6 +8,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix index 72b267e43c5e..06025a106185 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix @@ -10,6 +10,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix index b6fd701ac129..6839a367aac6 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix @@ -10,6 +10,6 @@ kde { meta = { description = "Gwenview, the KDE image viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix index 70904b17c232..58edc86b4291 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE camera interface library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 58528cb186bb..3084d16faef2 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A small utility to select a color"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix index 2c2ba3796a2c..3a5dca63e0fd 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A collection of plugins to handle mobipocket files"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix index 35af39aa611d..85a52c7d3d53 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -5,6 +5,6 @@ kde { meta = { description = "Strigi analyzers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix index 18c6534eb5c9..50bcc61bfbe3 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix @@ -8,6 +8,6 @@ kde { meta = { description = "Thumbnailers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix index 28d9252187e0..419bdc67eeba 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE monitor calibration tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix index 5276ec09f462..6a999b9b3db2 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE paint program"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix index c5c2c6e05d7c..3ce749dd7d8f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE screen ruler"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix index 1381ed7dd266..6ff2466f4b61 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A KScan plugin that implements the scanning through libksane"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix index f01a609e20de..508ce2c10d18 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE screenshot utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix index e7c01f98a8c8..ede5e6ff1ada 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix @@ -8,6 +8,6 @@ kde { meta = { description = "Library for decoding RAW images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix index 096b0a6e957b..fca746e05f19 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix @@ -5,6 +5,6 @@ kde { meta = { description = "Exiv2 support library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix index 6b16265e7a3e..6734ab015d75 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix @@ -5,6 +5,6 @@ kde { meta = { description = "Interface library to kipi-plugins"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix index b539eab38992..4d0bab676a26 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix @@ -5,6 +5,6 @@ kde { meta = { description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix index aca1691eace6..2b8d9231bfe8 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix @@ -12,6 +12,6 @@ kde { meta = { description = "Okular, the KDE document viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix index a344cc4b4b46..984665b2f4be 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix @@ -5,6 +5,6 @@ kde { meta = { description = "SVG KPart"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix index 7e29eebf3b79..2d1a174eda52 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix @@ -15,6 +15,6 @@ kde { meta = { description = "NEPOMUK core"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix index 0d29a4f97de5..febbaf61b4d5 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix @@ -6,6 +6,6 @@ kde { meta = { description = "NEPOMUK Widgets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 5248d6567d24..1e1ef0cf8468 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index a42e882710a7..64e3c34453ee 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index d891ad98fdc5..15d90be31314 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 972442dc56bb..2b0f729c0a35 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index d39778c93717..a447812f9a78 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "Notification daemon for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 6e0d9d3e7e71..8181b809c83f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 3131ea679b01..694db49f589e 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 33b64cd878ed..44f5a95224e4 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 5004f2aaf478..360e4a0a2503 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "GTK+ theme engine for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 5675c09fed81..cb2975d8214f 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index e30fcf223571..32a320c779bf 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix index 4776af3be324..62a90578bd30 100644 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 94fc0e369e5c..5ce88921fa83 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; description = "Thunar extension for automatic management of removable drives and media"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 919d19a23025..fdf4211f099a 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 8988d072e2c8..fab6152c99a4 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index b4c9c790ac1b..df218190357a 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfce4-appfinder/; description = "Xfce application finder, a tool to locate and launch programs on your system"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index e56eb3f0a713..671f57faeb35 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; description = "Tools and M4 macros for Xfce4 developers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index a5edb8dd560f..e654b2f7dfbe 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 7740af438d9c..45e213473f84 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a419f076b6e0..d965c296490e 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 2e76b22510f9..ee5ae15fca1a 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index e608d4591069..9ed2be4a7402 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 8067e1841caa..697ff2bfb8ae 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index bb235911ba4a..4b190889c850 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index fc4511d896e2..69557019f15d 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; - license = "MPLv1.1"; # Mozilla Public License Version 1.1 + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index b7dcb806b017..16dfa580a193 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4446876ab1f8..45040c2f3753 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 99c342da780f..be2f323fde1c 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -251,7 +251,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}"; longDescription = '' @@ -302,7 +302,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9713164711f1..fbeea0768ad3 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -364,7 +364,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -432,7 +432,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ef75cf71f581..8528be077295 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -438,7 +438,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 58732f1a0be2..62dbad747584 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -500,7 +500,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index ab7732a68eb2..8b185d00bcc0 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -495,7 +495,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index cd33d3d79a70..8b14dbc5cbfa 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Free VHDL simulator, mcode flavour"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1de0c88a6bc7..3cab8379720e 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://gentoo.org; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 4c3845f9ee56..070f29e16f64 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Ikarus - a Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 577533c2e528..a34fa965f066 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dragonegg.llvm.org/; description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 29950aa9e3dd..f6a52b52e1d5 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index bab8e66799b7..19f8eab482cb 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index b1ee1d000c4c..e4bdcf7889bb 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6fd7ad9d65b1..6a07c7af69e2 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://openjdk.java.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 90a64ecd5217..657d18070e96 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -180,6 +180,6 @@ let result = stdenv.mkDerivation rec { passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 97ec6b56305c..9b384c5ae460 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -80,5 +80,5 @@ stdenv.mkDerivation { mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index b488308f5c4e..faa281efc7a6 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.purdue.edu/~qobi/software.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; maintainers = [ ]; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7ad7348925b5..1e82e03f16c0 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.tinycc.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 6663e00c36ee..7617e5fb1cd9 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming environment. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; homepage = http://home.gna.org/guile-cairo/; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 30480844a414..90012bb3ddd4 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/guile-gnome/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 310c0e923805..2f77c273af7d 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/guile-lib/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 1eca6b3a3025..175c656859e5 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { form, panel, and menu. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index f44f71020b4c..55f1b1840fa0 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/guile/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 38fdcd2a0a6c..f08d1d2ec7e0 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index 8e7914afb616..fc1f01cb3730 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 13f7964769ca..51ddcd8f2906 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index eae2d82d5d0a..5ae5b4156a87 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 303ea1d74711..8fefcb0ec6db 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 3bcc85fb4342..eeb447e0e619 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 65badeae1dde..e112a5ae43d4 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maude is a high-performance reflective language and system diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index eb7e925561c8..72c0e2d53759 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f44efb943587..797fff584f6a 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation ({ meta = { description = "High-level interactive language for numerical computations"; homepage = http://www.octave.org; - license = "GPL-3"; + license = stdenv.lib.licenses.gpl3; }; } // ( if config.octave.devVersion or false then { diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index ccaa45c6c338..4b5f3bd8b3bd 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { meta = { description = "Ren'Py Visual Novel Engine"; homepage = "http://renpy.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 693b7bf8fe19..bc4b1a778fc2 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 49f5fec1da3f..3a7fa7072849 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index cbc4e0b8c89b..8c9c6a5b9ef9 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; - license = "LGPL-v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 59124f011dd4..48e96aeea26c 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { of course, AGG can do much more than that. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.antigrain.com/; }; } diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 7790f8e124b2..c5514acd1d43 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index fc8d0415c36b..2b5da8de423d 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 6b054aaf44b1..734bcc0797cc 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 2dca2a8e1ec5..ce7f92a20354 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://library.gnome.org/devel/atk/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix index 2464a09f51aa..3983816a8b44 100644 --- a/pkgs/development/libraries/babl/0_0_22.nix +++ b/pkgs/development/libraries/babl/0_0_22.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 41280e87253d..473df8819c0a 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 808310e326f0..823eac145485 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; broken = true; }; } diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 78bf7a678ac7..5105bd298762 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index daf36e28919b..2111e1b4a55a 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a0e1bcfa6121..4e75cda0c239 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = http://check.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 909e8ba7bf26..6c673a7dc028 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.cs.wisc.edu/condor/classad/; description = "The Classified Advertisements library provides a generic means for matching resources"; - license = "Apache-2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index a6ebbf8dfdc0..d84baedf96e0 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index c3878ef4b789..205f4d83693a 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 8297dc9d5da3..59c64b0de9f7 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index 00a4edd2a988..e5f5a455c899 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 3614d149489d..1d085222341a 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix index 898c931f354a..7a9d114ce8e3 100644 --- a/pkgs/development/libraries/clutter/1.18.nix +++ b/pkgs/development/libraries/clutter/1.18.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 808e67cd852b..027b90d8e11c 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f866b2299c1f..034d7d658e17 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index 0b834a5ddb32..348f7bdfb66f 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/commoncpp/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 9a71393badde..2c22af1684d3 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "A configuration parser library"; homepage = http://www.azzit.de/dotconf/; - license = "LGPLv21+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix index 123b53783a68..63afd22bcf88 100644 --- a/pkgs/development/libraries/exosip/3.x.nix +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index fb13e0b8c6f5..02349bc0267b 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index fc489f9eb665..99177578c779 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = http://www.audiocoding.com/faad2.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 92146c12e302..c394fd070286 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/ffmpegsource/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 87e47e1b046e..0cd161251c95 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 1d9862755630..2fe104e849fd 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a641040187a8..7c78ca3ed6fb 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: { meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; - license = "X/MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 2ba49162e2f0..1fd6c429dc02 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gdbm/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index 415a98029cc6..516fb9329833 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://gdome2.cs.unibo.it/; description = "DOM C library developped for the Gnome project"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index b2f2e85a1ea8..3f9a619ff6a1 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 0649775ad216..a589d625273d 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix index b153d91934b3..43ba2a9ca113 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/2.19/common.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation ({ most systems with the Linux kernel. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; #platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 6801012e8553..66fb0179489c 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [urkud raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index eb653591005e..2b1a5b571ef0 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/glpk/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index f87211195d52..d79293eced14 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; - license = "LGLP2.1"; # or later + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index f003979c701c..d0559c46795b 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 461187a509cd..c96c830e2f7f 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix index 89306540694b..6aea78a3ac52 100644 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } - diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ca9c003dfe74..cd48e08a39c4 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 70b4ab8639d3..383c1a7e223a 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gsasl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 9631746691f8..da4796fba896 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 4959a70ca631..207b82486981 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gss/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 466406fbe793..792b6d2e4dbc 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = "LGPL v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 820e8eb07c9e..ff26e727e9f3 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 49c612f59e74..89b6e73e6b6d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; description = "GStreamer's plug-in using FFmpeg"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index a433d717039f..988d1bba258a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a09f82797608..a0cd0a4c646f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 769de911fd6a..e4411fcefbbd 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index e960aa90421b..d01961f5cdeb 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index cadef6802728..f781c624cea1 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { interface. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 1427ec866a9c..97a4638170f9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ bindings for the GStreamer streaming multimedia library"; homepage = http://www.gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = "Philip Lykke Carlsen "; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 9a526de05b1c..d20f06635da9 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index ef8f3e398832..09221502e363 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://www.gtk.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 43d0db9755a3..69a0341a6953 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 17dc5469910f..6905adcd71e3 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { interpolation; GIF animation support. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index eaccf2fb08bc..2620d9cc120c 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "GtkMathView is a C++ rendering engine for MathML documents"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 0b59cbfc4892..727e4b2185c0 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 600ea1a0278f..47057b819e0b 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 7724bc5cc3ab..17ab80ce5868 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gts.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; longDescription = '' diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index c48130c555cd..6584c1ff9070 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; - license = "Apache-2.0"; + license = stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 78206de9f141..290f411cbf49 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = http://hawksoft.com/hawknl/; description = "Free, open source, game oriented network API"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 55c4dbff2960..99a256e48adf 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec{ meta = { homepage = http://ndevilla.free.fr/iniparser; description = "Free standalone ini file parsing library"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 760ad096fd0b..ac67c17218f0 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://irrlicht.sourceforge.net/; - license = "zlib"; + license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; }; } diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix index 995cd0510b4c..f1da2c064092 100644 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 7711d4f170f9..7e08c8afe6f6 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 3d4e5f260dce..0f0fa3f775a1 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index a924e2adfa63..5c83a0ba3579 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "GeoIP Java API"; - license = "LGPL2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index e15c5c8d179f..83d3149a50fd 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://jbig2dec.sourceforge.net/; description = "Decoder implementation of the JBIG2 image compression format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 8c45adf4b570..4199becb06d9 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://judy.sourceforge.net/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; }; } diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 115da78de979..c98a01f6f70f 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 774cc7047e8c..521118f31757 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index f1f1c7dd9092..94dfe8712403 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.all; maintainers = [ maintainers.urkud ]; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; }; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 3028ba7367cb..4e6dd6d5b028 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = http://www.ics.forth.gr/~lourakis/levmar/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 2fc03e0d67cc..f1cc25de39f1 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d9775c256104..f5a3d92d3db1 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix index 743528d92651..7f77183c8432 100644 --- a/pkgs/development/libraries/libassuan/git.nix +++ b/pkgs/development/libraries/libassuan/git.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix index 9a161ec170f4..2532cec03900 100644 --- a/pkgs/development/libraries/libassuan1/default.nix +++ b/pkgs/development/libraries/libassuan1/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 3c28b95c0667..758f86e5f9a5 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -18,7 +18,6 @@ in stdenv.mkDerivation { meta = { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; }; } - diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index c05528450543..e69cd4ed2acc 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libcanberra/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 34441d8fa7f8..d22ce9ae2bf1 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libcangjie is a library implementing the Cangjie input method. ''; homepage = http://cangjians.github.io/projects/libcangjie/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 8e4f8a36547a..b9823cefd2d9 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index fc26fb9aca11..db4af40afbd4 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 856d5124a3ff..ac7b428bfb00 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix index 79c734dcad62..a2b35a726518 100644 --- a/pkgs/development/libraries/libchamplain/0.6.nix +++ b/pkgs/development/libraries/libchamplain/0.6.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 263b34701eed..51b7f7e181d0 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1b16d361c6dc..f0d7fbfbeb69 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nongnu.org/libchop/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index b4cea379bbae..a5ff8d409b2f 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { available. ''; homepage = http://sourceforge.net/projects/libcue/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 58c150a22d6e..ba7e3e47ff76 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libdaemon/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index f92bc5855243..bc5f6a1d7a03 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 69f66d7f5b7b..7565502cc1c1 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "Capture and control API for IIDC cameras with AVT extensions"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index b8f79f2ae695..f9d1fc87870d 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - license = "LGPL-2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 21ee2351c58f..62c7d4322527 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/libdivsufsort/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; }; } diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index d3ce7082621d..6af8e7a415e2 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = http://www.videolan.org/developers/libdvbpsi.html ; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index a92a48bf75f9..a80c0677a3bd 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 6b3a16d1c092..8d2d820a2301 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.flamingspork.com/projects/libeatmydata/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; }; } diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index ac52876f887e..d9436456d0d4 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { homepage = http://www.mr511.de/software/english.html; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 48c66cb60706..4843b65c4d38 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libexif.sourceforge.net/; description = "A library to read and manipulate EXIF data in digital photographs"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 309816b65e5e..6df5ca683f1f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index ef7a67b7fcd4..6293632452ce 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; homepage = http://www.intra2net.com/en/developer/libftdi/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 430560107702..b039c84b2fb1 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = http://toxygen.net/libgadu/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index 9dc8b8a23179..ced3b723b132 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = https://www.gnu.org/software/libgcrypt/; repositories.git = git://git.gnupg.org/libgcrypt.git; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index c53b5479b7b2..ba3de49ede8a 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://gnupg.org/; platforms = stdenv.lib.platforms.all; @@ -38,4 +38,3 @@ stdenv.mkDerivation (rec { // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686) { configureFlags = [ "--disable-aesni-support" ]; } ) - diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 07e8d2869ce2..d07aae3ab807 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = http://www.remotesensing.org/geotiff/geotiff.html; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 8ce9a10701ec..663bd944fb92 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b286dcfcd199..7b669cd780ae 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/libiconv/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index da8a7d50b67e..802ee9e3e88f 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { included. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c7513b0a167f..1a39e0941535 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -37,9 +37,8 @@ in stdenv.mkDerivation rec { meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } - diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 1094a4e75919..158962d32940 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = http://libiptcdata.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index a2235da408e3..ab8c696a66c7 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index f991fdc2f299..e7e4cd6c75d9 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; homepage = http://packages.debian.org/unstable/libs/liblockfile1; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index b45b443f6dee..387028177346 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index be1f3f2b4b96..959dca475732 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { it easy to run an HTTP server as part of another application. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.gnu.org/software/libmicrohttpd/; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index fb6eacc366b0..94401c30a6ba 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = http://netfilter.org/projects/libmnl/index.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b1f7b0071c85..865330fdda7c 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libmrss/doc; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index a49cd95822f6..b78e583fa640 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A de/compression library for various Microsoft formats"; homepage = http://www.cabextract.org.uk/libmspack; - license = "LGPL2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 14b50bb51182..da32903c94e7 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 3bb698e9bf63..c47076014c43 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { It is only used by other netfilter.org projects, like the aforementioned ones. ''; homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index aeb0792dacfa..ab6931c63ca3 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A small library for C application development"; homepage = https://launchpad.net/libnih; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index b492a16a2055..f34c421a120a 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libnxml/; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 0d5bdfcc9a75..3782dabc67bd 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cypherpunks.ca/otr/"; repositories.git = git://git.code.sf.net/p/otr/libotr; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "Library for Off-The-Record Messaging"; }; } diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 9505a6cf052f..ab8e03b89a07 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 85e8bad89066..a987768bbc53 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://parchive.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; }; } diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index c968fd352eb8..b389176b3da8 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "trackball-based 3D viewer qt widget including many useful features"; homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 9b51f694ab3e..58ff77480b63 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = http://sourceforge.net/projects/lrdf/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 41445b841435..76daf7d748bf 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://librsync.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; }; } diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index b0a726ed7f35..ae6299286a17 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { more. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index c48c5265fc48..bd38c37a57b3 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a819e0cef6f3..7d46f9e32cef 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { handling and rendering Postscript documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 5e069655afc3..bae22ef220fc 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { portable, and only require an ANSI C89 platform. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 81336aed8aad..f7f0f79075d0 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 125cb890008d..f60043f18b17 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://live.gnome.org/LibUnique; description = "A library for writing single instance applications"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 9bc3cb7f9012..b578d895c5f0 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (rec { strings as internal in-memory representation. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad4..95299cb3fd7b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "VAAPI library: Video Acceleration API"; }; } diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index ececdabb56ce..85f0dbddb0b8 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index aebb81020b3a..61f519dfe51a 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix index 4b0acd83fc39..f94ca128228d 100644 --- a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix +++ b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 09860522ef41..fb81dc425f1f 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/1.6.nix b/pkgs/development/libraries/libzrtpcpp/1.6.nix index 767314cdcae9..8ca872864bd9 100644 --- a/pkgs/development/libraries/libzrtpcpp/1.6.nix +++ b/pkgs/development/libraries/libzrtpcpp/1.6.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index b18aa6848bfe..9962efa7f1e6 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 4ffbb9719cab..2a77c8e0623c 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { the MIPS and SPARC chips. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 32424d546b44..d4400d840c0b 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://log4cpp.sourceforge.net/; description = "A logging framework for C++ patterned after Apache log4j"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index f153c684629a..7fa6194cbca6 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.oberhumer.com/opensource/lzo; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index 9cfb8afa8eba..f9632dca9d22 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.libming.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index e5d212dc2690..652227d47e85 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpc.multiprecision.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 8e3281c862ae..e3fbaececb9b 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -39,10 +39,9 @@ stdenv.mkDerivation rec { floating-point arithmetic (53-bit mantissa). ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index f92fe3730435..2363f33de079 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; }; } - diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 3cc1c6ce43c5..9d9a524e86d0 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { homepage = http://muparser.sourceforge.net; description = "An extensible high performance math expression parser library written in C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 0a2df0003847..4aecfa4b01af 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix index cc20550802ed..15da5054291e 100644 --- a/pkgs/development/libraries/mygui/svn.nix +++ b/pkgs/development/libraries/mygui/svn.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index c1cada63abee..379848b0cb08 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 7b502822a180..7627fb79e992 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/ncurses/; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 4208402ab993..57d3732fa6dc 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { I/O. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.lysator.liu.se/~nisse/nettle/; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index d9369d59c7be..f5f72c006c73 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://fedorahosted.org/newt/; description = "Library for color text mode, widget based user interfaces"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index c9b685aa05b9..4f87f2bc230f 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { that this is a solid way to provide a co-routine based framework. ''; homepage = http://www.gnupg.org; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 6bb1916ed0fb..527bb25dce18 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = http://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index f508637dfefb..27193e045450 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; homepage = http://code.google.com/p/ogre-paged/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index b024b518b690..48f5bfc71e52 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenAL alternative"; homepage = http://kcat.strangesoft.net/openal.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 75d6033e1cc5..b5e390eafa85 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.openal.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix index 2c1b148251c6..b485fa3e947b 100644 --- a/pkgs/development/libraries/osip/3.nix +++ b/pkgs/development/libraries/osip/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 3ec3dac221f2..cfa838f5a370 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 1c62a64d006d..40b02c2afbb2 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 8518083b4d35..6d79587abcb5 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "A compatibility library for pango>1.30.*"; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7138c44da643..4cf6bd44dd3b 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; - license = "BSD-3"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The PCRE library is a set of functions that implement regular diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 5948fd0ef2b7..b29deae9260c 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index cb76a1b615fe..81619d9eb552 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 5e15a63735ee..35262f797e97 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://plib.sourceforge.net/; }; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b9412b37cbad..79cc8deff802 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -49,7 +49,7 @@ let Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } merge ]); # poppler_drv diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index b4c8a7f17890..acf760f4f799 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -107,7 +107,7 @@ let meta = { description = "Geographic Objects for PostgreSQL"; homepage = "http://postgis.refractions.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; @@ -148,4 +148,3 @@ in rec { }); } - diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index e3b1444b8cb3..f93eee674ffc 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://bugseng.com/products/ppl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 6e3cc7cac55c..17c05ada7a84 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Cartographic Projections Library"; homepage = http://proj.maptools.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 2f99b9d72183..dd39804983a4 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0826e6c5f7cb..05500f345acc 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 4e4c3c553616..0461e5ebcf54 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; description = "BioLib"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written in C/C++ and makes them available for major Bio* languages: diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 63de26ee90c9..bb33eed61421 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = http://www.chokkan.org/software/liblbfgs/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 41a6b8501eca..30c1f4937ecf 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 4e1187aa0f76..d7a0b11a8dab 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = http://www.speech.kth.se/snack/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 7d655ae122a0..fdad4e21b0b6 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Glue between Coin high-level 3D visualization library and Qt"; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 0e542b353f67..5104532ea91e 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Common interface to speech synthesis"; homepage = http://www.freebsoft.org/speechd; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index e6769285fc81..28afdf85dfbc 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A software framework that allows research manipulation of Biblical texts"; homepage = http://www.crosswire.org/sword/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 54db07d0de82..e04363326d01 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "talloc is a hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b06dffa1202d..cb34edb4762d 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 02a1008cda5d..d0eb8987ea08 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tdb.samba.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 82ce734d1735..7741549666ad 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { robustness, supports 64-bit architecture. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ee742487e263..ccd619e8bc18 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://fallabs.com/tokyotyrant/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index a0d607517ac3..bdc2b4da6e3e 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent SOCKS v4 proxying library"; homepage = http://tsocks.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index cef853698a8e..05acc6f53085 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.oberhumer.com/opensource/ucl/; description = "Portable lossless data compression library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 2ec478d7a76c..f3ac325b5a12 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 11dc34176f53..03769815a3e2 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -23,7 +23,7 @@ args : with args; meta = { description = "unix odbc driver for postgresql"; homepage = https://projects.commandprompt.com/public/odbcng; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; ini = ""; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f05c01bf58df..6f1cb572b9bc 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Intel driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 9a81b840b35d..9b28d0016ddb 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 97251e15c497..04bef5ef41c3 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = http://hci.iwr.uni-heidelberg.de/vigra; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index c92df5a8bcb4..846fc64a91e4 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.vmime.org/; description = "Free mail library for C++"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index c9e7fb4249d9..1ff34d45ba33 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix index 57240eb73356..b89900d2b05e 100644 --- a/pkgs/development/libraries/xapian/1.0.x.nix +++ b/pkgs/development/libraries/xapian/1.0.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Xapian Probabilistic Information Retrieval library"; homepage = "http://xapian.org"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix index b6bc94814e64..9ce5312f69ab 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec { meta = { description = "Bindings for the Xapian library"; homepage = xapian10.meta.homepage; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 7ea79a629245..1c1426d969e8 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xerces.apache.org/xerces-c/; description = "Validating XML parser written in a portable subset of C++"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index afb23e4de354..80f4e2fc8604 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.aleksey.com/xmlsec; description = "XML Security Library in C based on libxml2"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index f79483874f6b..a0466091a526 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "GUI tool for avrdude"; homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/misc/intelgen4asm/default.nix b/pkgs/development/misc/intelgen4asm/default.nix index d0e2517cdd9e..c7365f944e95 100644 --- a/pkgs/development/misc/intelgen4asm/default.nix +++ b/pkgs/development/misc/intelgen4asm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/xorg/app/intel-gen4asm/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Program to compile an assembly language for the Intel 965 Express Chipset"; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 21610f8f3103..ff344ef6f327 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://cristal.inria.fr/camlimages; description = "Image manipulation library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7379a62d4244..8f18658b0f65 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b2702a5cade6..f4837bd047f5 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "An ocaml wrapper for the Expat XML parsing library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 4d46bda243f3..f1ec69143b07 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://gmetadom.sourceforge.net/; description = "GMetaDOM is a collection of librares, each library providing a DOM implementation"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 46398d26114b..8b611c65a41d 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 75c8d7ad2244..7cefe26746f8 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.pSub ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 392cf5c9772d..c2f50c4e5b83 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (rec { ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; description = "LablGTK is is an Objective Caml interface to gtk+"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 976910aae29a..333e86fa3fe9 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "OCaml bindings for gtkmathview"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ed70d1b9c3ee..0ae60ab07e4a 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 8f19847680b6..94395f601aa4 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 6361dbd9ae64..51af8d99d69b 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlsdl.sourceforge.net/; description = "OCaml bindings for SDL 1.2"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 63dc06634d71..d92207cd20b1 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; description = "OCaml bindings to the SQLite 3 database access library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index e996b6223b1e..77ffa7528981 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 19beeec1ec54..72efaa0606d7 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 5d22970155b6..3b7f77ae96d1 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -21,6 +21,6 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; meta = { - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 619f2f14b96b..340c5805e9c9 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -16,7 +16,7 @@ buildPerlPackage rec { meta = { homepage = http://search.cpan.org/dist/DBD-Pg/; description = "DBI PostgreSQL interface"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index b30e2f12fc62..2b412d518c5c 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -34,7 +34,7 @@ buildPerlPackage rec { In addition to MySQL, there is support for PostgreSQL, Memcached, and a growing variety of other databases and technologies. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.maatkit.org/; }; } diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 32ef97bf29c5..d88504379ed0 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Python DBus bindings"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a6efb8bdc2b3..93fa70e44bcf 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 374158da810c..cc36680fcb01 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { plots in publication-ready quality are built out of these primitives. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://pyx.sourceforge.net/; }; } diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 9ad34097d0b1..89a17d28a1b9 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://ltp.sourceforge.net/coverage/lcov.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.mornfall ]; platforms = platforms.all; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d549bd8fb198..2ab8c05ebf85 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Free advanced command line hexadecimal editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix index f7fb810410dc..a2d135d44841 100644 --- a/pkgs/development/tools/analysis/radare/ired.nix +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Interactive Raw Editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a6ea2c2f59d4..a7e55de7d47d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 3a0879d6edfd..18481d16f17f 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index f21be7cc48c7..870664c252a5 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -34,7 +34,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 2d7c63fdc7de..ccbf74e528e2 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -52,7 +52,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # Of course, we don't really need that on NixOS. :-) description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 25ef7ef0b246..edc901858b83 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Simple wrapper around make to colorize the output"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 56d2326c916b..2a8c80e7db26 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 4f3c7defa488..6b24df39be9a 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix index 6a76fa0302b6..2da17490abff 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f8466e5aafda..b7316fc17c4a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { build-by-convention behavior. ''; homepage = http://www.gradle.org/; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index c6856dae5651..75d72e3d52a0 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 9a8979aaa6cf..54509178b1a1 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; description = "Doxygen, a source code documentation generator tool"; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 8698dc27b401..74e967686f3e 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { generating Guile wrappers for C functions. ''; homepage = http://www.nongnu.org/g-wrap/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index cfcd8564b4cc..c8bb94412cad 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -24,7 +24,7 @@ let version = "0.94"; in homepage = http://fastjar.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 88246e4bb6eb..b35ec4357c4f 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; homepage = http://josefsson.org/autobuild/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index f6793e3aeec0..c3b44ca56863 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 08fcd95afb5e..38fe289d29a1 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 0af9877c9355..2cd80eb4bac5 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 269d423f2fab..6a93cdc78fdc 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 96a93e8d60b5..d4369787f1b6 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index d20ea2c2e91c..0c6ed42825a9 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3caeee7287a1..8d8fc5d464e8 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/binutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; /* Give binutils a lower priority than gcc-wrapper to prevent a collision due to the ld/as wrappers/symlinks in the latter. */ diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index bf927db2793c..2cc8e640631a 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Tcl/Tk GUI front-end to cscope"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://sourceforge.net/projects/cbrowser/; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index d9be5802fa95..53bc8ed78c8b 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { produced flowcharts in Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/cflow/; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index d313d271afbb..09c9325d4ff2 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/cgdb/cgdb.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux ++ cygwin; maintainers = with stdenv.lib.maintainers; [ viric ]; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 122c256657f0..0bf5bbce692d 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ''; homepage = http://coccinelle.lip6.fr/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index cfdc35f1b346..9f1eca0fa13c 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { addresses several issues not considered in that scoring scheme. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/complexity/; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index f9246df9e567..500129c7c9de 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { to the level of nesting of that directive. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 0a6895aff6b9..91150255bdaa 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 9e400cc5c62a..bc22752fe7ed 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/dejagnu/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index b3a86a03d97c..2b5ced780633 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gdb/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d0efe4e62494..9926dd6cd334 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gengetopt/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fdb5f72af830..d6abf8d10bdb 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 75e8e2dfe4fd..67688254a407 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { compiler or as a macro processor in its own right. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 2f35f96e9329..a434e54bba9f 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; homepage = http://www.jirka.org/gob.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index 478d2162b337..e25998e54204 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/gperf/; }; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b447cf918cf1..cd8ad0d64cd7 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://gtkdialog.googlecode.com/; description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2d60a06fb3e1..23bd35c8739a 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index caa277bfbf5f..0940bcca191a 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Hydra, the Nix-based continuous integration system"; homepage = http://nixos.org/hydra/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0c82c2cd2759..17714b7a9d45 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/indent/; description = "A source code reformatter"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 0465b6d90a89..086f4b5fed33 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceforge.net/projects/inotify-tools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index c7f790b7d50a..07ef5ffc082d 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { ''; homepage = http://siliconforks.com/jscoverage/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 78cd15e04bdb..5eee9ead5d63 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4c3500c65a24..8b0a92c12445 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index a54102043408..dc7eb5cabfd0 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 10cf371f13a8..a71afd5d4729 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "McCabe-style function complexity and line counting for C and C++"; homepage = http://www.parisc-linux.org/~bame/pmccabe/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' pmccabe calculates McCabe-style cyclomatic complexity for C and diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 9dc50abf3f73..455305be7492 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { the Perl CPAN library using this tool suite. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.dwheeler.com/sloccount/; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 6b99a5755e42..6b06bf385b3b 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = https://code.google.com/p/stm32flash/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index e3acf620c73b..1b4cab361ce5 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 7fa604e4af65..1f36a14fa979 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Perl script which converts Texinfo source files to HTML output"; homepage = http://www.nongnu.org/texi2html/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 9a41d2963424..5131d3814123 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { well-integrated with GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 732d3ab92c15..234ff82b50a0 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; homepage = http://savannah.nongnu.org/projects/uisp; }; } diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 303cdf89a050..bba7ef7fad04 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 36047210a924..1d7e6b330423 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://furius.ca/xxdiff/"; description = "graphical file and directories comparator and merge tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = []; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 18b03f5923bf..4c0176de7e88 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5660d51f0606..5bf5d7c2e8c6 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 284223905f64..5947f85343c4 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 2dec606254b4..08980d5b1c4b 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -37,6 +37,6 @@ composableDerivation.composableDerivation {} { meta = { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ee4644239298..e301fe8431af 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { is profiled: hardware and software interrupt handlers, kernel modules, the kernel, shared libraries, and applications. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://oprofile.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b6750f889373..457a5d1dcaa5 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; description = "Sysprof, a system-wide profiler for Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 884091c1636c..66dda8f43efd 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/systemtap/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 23f0dea44535..baa816589cab 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index cf3f6e1563b8..6f5fc2add3a3 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = http://www.andyetitmoves.net/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [bluescreen303]; }; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 77891f438813..86f4b961315e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { * mastering long poems * even practicing guitar chords! ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index bf2fb1e89c21..93297171bcb8 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://www.asc-hq.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index c923f0894052..4a7eb9376da7 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { with Guile. Follow the example level sets and the documentation. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ballandpaddle/; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 3bb17b3e02f9..b4e61b6d1d1f 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -37,7 +37,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188 meta = { homepage = "http://shh.thathost.com/pub-unix/"; description = "print large banners to ASCII terminals"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' An implementation of the traditional Unix-program used to display diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 252f881c3752..57cd67fbb7ba 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; homepage = "http://moikmellah.org/blog/?page_id=19"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 0f4904bfed97..d7e2cf4894dd 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://home.gna.org/blackshadeselite/; description = "Fork of Black Shades"; - license = "GPLv2+"; # Says its gna.org project page + license = stdenv.lib.licenses.gpl2Plus; # Says its gna.org project page maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 085c7c4082cb..46f5b3d01830 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index ce3a0c8fa3c3..0798173a64d2 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer 3D Tank game"; homepage = http://bzflag.org/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 99bf2d41fd69..538efebf8334 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = http://www.nongnu.org/crack-attack/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 944b67041c26..b50aa7040484 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { description = "A model-airplane flight simulator"; maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 6036d7fabd55..f0d885c1f882 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/dhewm/dhewm3; description = "Doom 3 port to SDL"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 1a026132e525..8cc1b9933cde 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 1f879393868f..96ff52446ec4 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "3D dungeon crawling adventure"; homepage = http://www.freedink.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like # maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index a30ff7e2f871..94451ef8930d 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ''; homepage = http://www.freedink.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index d83358cd69d7..d26dfc2401c0 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; homepage = http://gav.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index b58654f1f429..d925c8810bf3 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gltron.org/; description = "Game based on the movie Tron"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 21c4195b28b8..3f1d52c5fc03 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "GNU Go - A computer go player"; homepage = "http://http://www.gnu.org/software/gnugo/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index ee792ef1e4d9..7bdcc7afecd3 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/icbm3d/; description = "3D vector-based clone of the atari game Missile Command"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 6ab6b8d79d7b..8668de26a199 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple text adventure interpreter for Unix and Windows"; homepage = http://instead.syscall.ru/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index cbc445f62161..c7b40db5caff 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Just another free touch typing tutor program"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 70288e549a4e..8fe7591cde0c 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f2ac737486c6..f19596789cef 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation { meta = { homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index c2a7ee90a1f6..580b27ab21d0 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; homepage = http://www.naev.org; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 4062405407bd..88cfbe98851c 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://trackballs.sourceforge.net/; description = "Cross-platform pacman-like game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index f62570dbd089..49dbb7ba82b4 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = http://oilrush-game.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 0c7e46ae0740..b031cb3f0dd0 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { meta = { homepage = http://openlierox.net; description = "Real-time game with Worms-like shooting"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 09a7761326a6..1b6b7f26a41e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { - observe as spectators ''; homepage = http://www.openttd.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ]; }; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 04d2f2ecb8b0..19aff03dacaa 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { repositories.git = https://github.com/SupSuper/OpenXcom.git; maintainers = [ stdenv.lib.maintainers.page ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 77e8ab3b92e2..af9900cede53 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pio.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Addicting game based on The Settlers of Catan"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 009d07d4456c..7c58b4ca1e86 100755 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.uberent.com/pa/; description = "next-generation RTS that takes the genre to a planetary scale"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index d5f9ca6ee23d..98cf0dbeed8d 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/3dpong/; description = "One or two player 3d sports game based on Pong from Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 8969b613cebb..06e43fd273f0 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://hippo.nipax.cz/download.en.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 809bcc930d24..26c7e0a36677 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = http://rigsofrods.sourceforge.net/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 934213279fad..fbf47653af99 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://ri-li.sourceforge.net; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' Ri-li is an arcade game licensed under the GPL (General Public License). diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 3848f22ed204..cf55bcd597e2 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { meta = { homepage = http://scorched3d.co.uk/; description = "3D Clone of the classic Scorched Earth"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 196561d1e379..ea050d278691 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 7a78235bdff1..e6105eab95b9 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; homepage = http://speed-dreams.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 51149d4f2607..1c9cc1393432 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } */ @@ -119,6 +119,6 @@ stdenv.mkDerivation { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 31fd25a5150f..7b258deef8a9 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { meta = { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = http://code.google.com/p/vdrift-ogre/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index cd2698665f62..29d3b4e45571 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://supertuxkart.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index 72a894b63afb..c8e0d3f097ff 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://supertux.lethargik.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 18a911d563bd..e5d9e5e97513 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/teetertorture/; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index e06aec68b1a2..83b2c62870e5 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/tennix/; description = "Tennix 2009 World Tennis Championship Tour"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 979fcd1a48c3..f7734c320e64 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -54,7 +54,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; passthru = { inherit srcDrv; @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 698653784a7e..a2355ba9d1e8 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 473161771158..e6370d6e7c61 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 2a25c290b2d8..a5ae8ec8b6de 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Rally"; homepage = http://trigger-rally.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 2fef444328cd..0d909e1c43c1 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufoai.org; description = "A squad-based tactical strategy game in the tradition of X-Com"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 4b1cab6531c7..c90972db66ea 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ultimatestunts.nl/; description = "Remake of the popular racing DOS-game Stunts"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index dbae3e167247..47fcd2dc4cf9 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 07055c415585..9d233d383384 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; homepage = http://sc2.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ jcumming aszlig ]; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index af112c37af4f..bba7823f6630 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://vdrift.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 6f0fb48f0a5f..f87633e299bd 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/vectoroids/; description = "Clone of the classic arcade game Asteroids by Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d9fcb47bcc36..0b3448737346 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer remake of ZED"; homepage = http://zod.sourceforge.net/; - license = "GPLv3+"; /* Says the web */ + license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 8f0830be1862..b5e4adfa0b91 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix index 8a08eadc6a48..e99ad03212c2 100644 --- a/pkgs/misc/cups/pdf-filter.nix +++ b/pkgs/misc/cups/pdf-filter.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cups.org/; description = "Image and pdf filters for CUPS"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 942bf2c21840..015c61e461e6 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; broken = true; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 181a89b66677..d15e873422e3 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; homepage = "http://www.vanheusden.com/bsod/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index c23b60c29b30..60854f8550b8 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index e3c9dbc84e5d..5462f7727033 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://fakenes.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 150b45dd7275..7ef63f93026d 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix index d67121fe430a..571e14347b49 100644 --- a/pkgs/misc/emulators/mupen64plus/1.5.nix +++ b/pkgs/misc/emulators/mupen64plus/1.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index d67121fe430a..571e14347b49 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 9f93c9957d65..0fa5a08d2dc8 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Ultimate/Unix/Unusuable Amiga Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.amigaemulator.org; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 8323ca082b7f..b869143ff1cc 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = http://www.viceteam.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 3dd3d4bc7311..8103ff9c43f3 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; homepage = http://code.google.com/p/winetricks/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index a85d0fb389e2..0366b9dd22ce 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index c3bced292005..bca81a4b6b3a 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; }; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index ef8cb7d0a927..945d6556837c 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index fa2c36cf2c28..bb3520e300ab 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { meta = { description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; homepage = http://freestyle.sourceforge.net; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 142c75aeb0fa..275b93e01b8b 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -23,7 +23,7 @@ let of output drivers for various file formats and printers. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index 0c9059a30085..4bdb6e132fbb 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation ({ kernels (such as Linux). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/; diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 3eaa6336ec27..4b16652ba053 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ meta = { description = "GNU Hurd's libpthread"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix index 54c6429955bb..6d2d20687bc6 100644 --- a/pkgs/os-specific/gnu/mach/default.nix +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ were added using glue code, i.e., a Linux emulation layer in Mach. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 9ee188b0c8c6..34426b45d55e 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { Mach-based inter-process communication. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix index 4897c0c0af80..6f3d719d8169 100644 --- a/pkgs/os-specific/gnu/smbfs/default.nix +++ b/pkgs/os-specific/gnu/smbfs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/hurdextras/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix index 946e4c0c109c..5e2f428130cd 100644 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ b/pkgs/os-specific/gnu/unionfs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/hurd/hurd/translator/unionfs.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index a3400ee0823f..0fc799225153 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { battery and thermal information. ''; homepage = http://sourceforge.net/projects/acpiclient/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = maintainers.mornfall; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index c7f96206eab4..6fc3bbe7c08e 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; }; } diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 06af0c9228a6..70c8f36105c7 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; homepage = http://sourceforge.net/projects/afuse; - license = "GPL-v2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 5ebe1c06279b..1a602858b7ab 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; - license = "GPL2.1"; + license = stdenv.lib.licenses.lgpl21; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index a7ff782d69ed..9de84e228c43 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 81ead8d33d0e..5c5c2f026afd 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description="Kernel based automounter"; homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; executables = [ "automount" ]; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 88c7ffd93ee2..6e57e7651c45 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 0b7b6a0cafb4..fee955bcca21 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 0cc4e3741c26..43673c899b44 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; homepage = https://ftg.lbl.gov/projects/CheckpointRestart/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7226acf0e579..9e81508080df 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = http://busybox.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 022ea648fea3..4ea9295ef4f9 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0f4a1b6985ef..d3a0b827ed10 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 57fc9390f61e..b60232a9b754 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { Small program for Linux that will turn your Scroll, Caps or Num Lock LED or LED on your ThinkPad laptop into a hard disk activity indicator. ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 138b4ff468f1..c95532f13602 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dag.wieers.com/home-made/dstat/; description = "Versatile resource statistics tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 419207882f83..20419fe816d3 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A very fast random number generator kernel module"; homepage = http://frandom.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index a9278f0c7ce0..e2a5cb37c942 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/google-authenticator/; description = "Two-step verification, with pam module"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index d0e77a3bb700..6c5dd330f658 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -38,7 +38,7 @@ in it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.tuxonice.net/; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index e701c91019df..325a44f97aa4 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://fedorahosted.org/hwdata/"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 33ac05aef478..1aa10648861d 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = http://code.google.com/p/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 63a056712ac3..00f27a43e65a 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 7c688943ea82..a47b59e9e567 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/jujuutils/"; description = "Utilities around FireWire devices connected to a Linux computer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 30e2a37cb91b..6d9baed7f2dd 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,7 +198,7 @@ let " (with patches: " + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.kernel.org/; repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index fc05fc234525..d1eb38df6da2 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "keyutils-1.5.9"; - + src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = "make install DESTDIR=$out"; - + meta = with stdenv.lib; { homepage = http://people.redhat.com/dhowells/keyutils/; description = "Tools used to control the Linux kernel key management system"; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index eb776dcb86d0..163ac1890505 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://latencytop.org; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 202831309f0e..a4d9e5a866df 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.the-kenny ]; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index bbeb2851ea38..3670f06e5439 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Library for working with POSIX capabilities"; homepage = http://people.redhat.com/sgrubb/libcap-ng/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f878d2844964..bb5dde9a61ed 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://userspace.selinuxproject.org; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 700455d5f8b9..93cab433c9c6 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lsi.com/; description = "LSI Logic Fusion MPT command line management tool"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9386b50969fd..76f4661ecfc1 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tazenda.demon.co.uk/phil/net-tools/; description = "A set of tools for controlling the network subsystem in Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index a863ee8a4d04..e843658dfc28 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; homepage = http://www.atoptool.nl/downloadnetatop.php; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 42bacd41be03..bb85acf4dcbd 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nfs.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d85c0c1a389f..0014a5d2ee53 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index f9aa80fba836..9acaee797f0c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index e28593d02522..88ab08e6c3d2 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; broken = true; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index fe5f938b75b3..2cf375c8368b 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; description = "A one-time password login package"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index b5672728b536..f5fdc5670871 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pamusb.org/; description = "Authentication using USB Flash Drives"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index b53c61c754ae..787b72fde480 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { the PCMCIA subsystem to behave (almost) as every other hotpluggable bus system. "; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e3b6168be9b5..4fb7fc8cb0b8 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index f966180a8b69..c1049d78f42a 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 13a6e87319ed..7fa32ce4c943 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 89e9ff663423..b4b4569def4b 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { meta = { description = "A tool to handle hotkeys on Apple laptop keyboards"; homepage = http://www.technologeek.org/projects/pommed/index.html; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 702ebc5d8284..04ab624b86a4 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Analyze power consumption on Intel-based laptops"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/psmouse-alps/default.nix b/pkgs/os-specific/linux/psmouse-alps/default.nix index 65f1a5cf6c61..9dd78f5885ad 100644 --- a/pkgs/os-specific/linux/psmouse-alps/default.nix +++ b/pkgs/os-specific/linux/psmouse-alps/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "ALPS dlkm driver with all known touchpads"; homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 4dbe7e54247a..3dd4588b0837 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; homepage = http://fdd.com/software/radeon/; - license = "ZLIB"; + license = STDENV.LIB.LICENSES.ZLIB; }; } diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c95d27005efb..cc1363156dd7 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux Tools"; homepage = "http://oss.tresys.com/projects/setools/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2b4888f89cdf..ec504bd92357 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 8ea3599ff198..fe79c23dc440 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { homepage = http://tunctl.sourceforge.net/; description = "Utility to set up and maintain TUN/TAP network interfaces"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index e7cce315e8c6..a0df3d526f59 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index d2b3632d69ae..9bf8692d1ce9 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/tom5760/usermount; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index f84088a93028..a4fd00e4911b 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation { description = "An Xorg driver for multitouch trackpads"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index ae24e32a1577..7abf6d7c8288 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { description = "Brings multitouch gestures to the Linux desktop"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 8f8477d1864a..4b118a5a7cdc 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { meta = { homepage = http://qt-project.org/wiki/jom; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = "GPLv2+"; # Explicitly, GPLv2 or GPLv3, but not later. + license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index cd417eb9ad09..dde4f5d73711 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation { homepage = http://sourceware.org/pthreads-win32/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 5e86d60871df..585228af2b45 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = ""; homepage = http://bird.network.cz; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index 3d0324775f89..0fec6a5fe0e9 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the Default.scala included in the distribution as a template. ''; - license = "APLv2"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 2431c86ddb65..07dff1cf5855 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/modwsgi/"; description = "Host Python applications in Apache through the WSGI interface"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 8c0118912f5d..a86f924346bc 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -35,7 +35,7 @@ let version = "0.11"; in homepage = http://www.gnu.org/software/myserver/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 40b4ff1f2d72..bbbe54b95fd9 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 9da83fe891fe..56d402397ecd 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://leafnode.sourceforge.net/"; description = "Leafnode implements a store & forward NNTP proxy"; - license = "X11"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 78792c3a4f72..aa9da965d172 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = { description = "a scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 67dff3f6572e..3694547c2d99 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { and group by, and is easy to setup and learn. ''; homepage = http://www.rethinkdb.com; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 898bfb711ffd..958578138bc2 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { native utilities). Finally, it can replace the inetd utility! ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/pies/; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index a398a3ccdf98..781fca1c33d2 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix index dcd577bb6cb7..a8c991e12d3e 100644 --- a/pkgs/servers/radius/default.nix +++ b/pkgs/servers/radius/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/radius/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 76e416d64724..569ec87c4cb0 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index acff3a84a31e..2d827c737d8b 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = https://code.google.com/p/shellinabox; description = "Web based AJAX terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.tomberek]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 2afec801961c..fdb1dcbd1cf6 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 90e71f5e47ad..14cd91ee1418 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = http://www.gnu.org/software/sipwitch/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 642b713daaab..a6552738ea6d 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -16,7 +16,7 @@ rec { meta = { description = "http-proxy"; homepage = "http://www.squid-cache.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 96073645cc1c..ee566c32def5 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://unfs3.sourceforge.net/; - license = "BSD"; # 3-clause BSD + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f15705d4a113..5868125c97f1 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open-source XMPP application server written in Erlang"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.ejabberd.im; maintainers = [ lib.maintainers.sander ]; }; diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 61f6478629dd..6a6b8563a555 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { Bash without modification. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 4354a3cd0b3a..1e1904a29a5a 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/rush/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 1fe3cb646ff4..8506c9f38f3d 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; updateWalker = true; }; diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index b2bdbe8aaeaf..00cf9a54fb7e 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast and small background setter for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; }; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 96241bd02cdf..d91f4bfdf652 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 57417fa77211..0d63c190b054 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html; description = "Launch shell commands with your keyboard or your mouse under X Window"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 42e26825e330..eab21f2d2211 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ce439d22c21c..0e92021b62c9 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "macros", retype a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xnee/; diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index c9f41b68446a..efc0647f5dbd 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; description = "xtrace, a tool to trace X11 protocol connections"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index ec139e7240d3..54dac32141fe 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.analog.cx/"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index b2dedf4688d3..3d5abd074d96 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tigervnc.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 187d3345e6b3..acb8708ec14f 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; description = "TightVNC is an improved version of VNC"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 6428fbaa9dc4..87324ac80a24 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { archives). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index ff51b28f34bb..cd0cea13a14d 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; - # license = "LGPLv2.1+"; + "unRAR restriction" + # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 273b394881b6..afd734fbae04 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/sharutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 0258edb8a194..89f577e93ad0 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://viric.name/cgi-bin/btar; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index e51d6d6acea1..baa0d6170162 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; homepage = "http://chunksync.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 8a9db4e5701f..45d6cb83739a 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "http://www.nongnu.org/duplicity"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index be5e0ef4abcd..4df142afe3a5 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.httrack.com"; description = "Easy-to-use offline browser utility"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index d58815f6d6dd..58affe10e4e1 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 9b147d68230f..0bd19e2d6be8 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { meta = { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = http://rsnapshot.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index b8b7510b882b..e5a4f83ab0f8 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bluetooth manager for KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; inherit (kdelibs.meta) platforms; maintainers = [ maintainers.phreedom ]; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 0d44624786b6..bcf9ec2c0cc3 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { ''; homepage = http://cdrkit.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 39b7c8098582..516f07508072 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = { homepage = http://unetbootin.sourceforge.net/; description = "A tool to create bootable live USB drives from ISO images"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index fd0f131b8c2a..f181ab71edfb 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = http://vobcopy.org/projects/c/c.shtml; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 62a802ebab5f..88cca66efb13 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { filesystems. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xorriso/; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b1d127635f61..b7bf9c59f494 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { is just a bonus. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 6fd1ae97d960..51f61fcf239d 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ck.kolivas.org/apps/lrzip/; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; inherit version; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 8c4547753aa3..ca8d356abb3e 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; description = "The RZIP compression program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 283b751cf26a..c012be7c56d4 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { meta = { homepage = http://upx.sourceforge.net/; description = "The Ultimate Packer for eXecutables"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 4c00252fc2a1..5a43aa52a0ec 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c51837eef181..d91525e348f7 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; homepage = "http://chunkfs.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index f944e591a126..97548442ebae 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 0e72c45e31ad..75e5280d391d 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://fsfs.sourceforge.net/; description = "Secure distributed file system in user space"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index dce7757d23a2..c6d2776f437a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "an open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 6f68a798ede9..b0f7981ebb3c 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://httpfs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 4cb09d53adcf..2a7d9672843d 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Tools for MTD filesystems"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2c14bc624ae3..0c5ec063b1aa 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.namesys.com/; description = "ReiserFS utilities"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 3951a8d8bb79..89e49c9586c5 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/s3backer/; description = "FUSE-based single file backing store via Amazon S3"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4787ed77b599..b6a296e6bc7b 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index b77d63d510df..2d1a6472205e 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index debc340ee4ce..dc1a8b3abaee 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = http://www.lcdf.org/gifsicle/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 10cd9adf2b3c..94a613078a47 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/icoutils/; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index ed69327b752a..36a75743ed8a 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.mcternan.me.uk/mscgen/; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Mscgen is a small program that parses Message Sequence Chart diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix index 1a7c3317cf9f..f14c16775f8d 100644 --- a/pkgs/tools/graphics/panomatic/default.nix +++ b/pkgs/tools/graphics/panomatic/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://aorlinsk2.free.fr/panomatic/; description = "Tool that automates the creation of control points in Hugin"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 857a86d57af1..92dce64dcfd4 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { statistical capabilities. It allows significant user control over colors, styles, options and details.''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ploticus.sourceforge.net/; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index bb250b9d8523..ae0c4d197315 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/plotutils/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index df1046cb750f..fe01a9459ecb 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 62816705b8f0..d4e977128cfe 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "translates PostScript and PDF graphics into other vector formats"; homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 747c4b44ac80..2795b0d4d871 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/fcitx/"; description = "A Flexible Input Method Framework"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [iyzsong]; }; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index f2fe1d959303..d2d29aae785d 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ longDescription = '' diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 024798a84e3f..78383f4185d5 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f7c121d825e2..52d80a8812e0 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b0dbb049cbf7..8844fe9c57cc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -75,7 +75,7 @@ let operating system. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 35e4c3ab4d48..ac9685b83f5d 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { homepage = http://cunit.sourceforge.net/; - license = "lgpl"; + license = stdenv.lib.licenses.lgpl2; }; } - diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ddf30f342d15..49e158ea2d04 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with stdenv.lib.maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index aac7855827cc..d37febcf506a 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap - license = "GPL-2"; # gentoo says so.. ? + license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 435115ffc596..65a0047738bc 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { (or CP-1252) characters in them. ''; homepage = "http://detox.sourceforge.net/"; - license = "bsd"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 77d1d58c30c2..1cbbb9720c9a 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; + license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. @@ -33,5 +33,3 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } - - diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 14e6a2f6681f..41c479e414b3 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { files within a set of directories. ''; homepage = http://code.google.com/p/fdupes/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index d0a03f955a89..d6ae74e02b5e 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 88cb2c313c0a..a6ea96b77db5 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 50af2a12c24b..16c7f652deca 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 17cd86014dd4..b1877bdcf98c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/grub/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index a937e96eed55..5f21559d4715 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = http://gsmartcontrol.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index f3c5dd02c7e5..835ceb32881e 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index ab6102cf23c5..227fba3d377e 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.glassechidna.com.au/products/heimdall/; description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices"; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index e01a28ab1850..2b2f3aeaca3c 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/idutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index fe9c46dac64f..2fa712239314 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index db2d6cffc408..ee521f047006 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.columbia.edu/kermit/ck80.html"; description = "Portable Scriptable Network and Serial Communication Software"; - license = "free"; + license = "free non-commercial"; #Kermit http://www.columbia.edu/kermit/ckfaq.html#license }; } diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 2c2a547f2fdc..2eb63f09216f 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { description = "Keychain management tool"; homepage = "http://www.gentoo.org/proj/en/keychain/"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 15c6258e86fd..308b5217a6fc 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = http://packages.debian.org/sid/lockfile-progs; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 594947ba13d5..94c08fa9ba9b 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "File Manager and User Shell for the GNU Project"; homepage = http://www.midnight-commander.org; repositories.git = git://github.com/MidnightCommander/mc.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 761b2c5bdbfb..ffd8966a80eb 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = http://mcrypt.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; }; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 2b15d4470c36..82650999b730 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index f177e9e84c28..3200c7016b66 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://mktorrent.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 941d805a6ffb..b7f7842680f6 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { windows and can scroll left and right. Why settle for less? ''; homepage = http://www.jedsoft.org/most/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; # random choice }; } diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index a9d32205ceab..6d3634ea7af9 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://ms-sys.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "A program for writing Microsoft compatible boot records"; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 5d93ef44b36b..0dad6c2d33f3 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "GPL"; + license = "BSD-Original"; }; } diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index fbc6d6076500..2a081b882ab8 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://palcal.sourceforge.net/; description = "Command-line calendar program that can keep track of events"; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index fa6f147efe49..df360bb9804d 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/parallel/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 54697f98414a..d516e50124c8 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight GTK+ clipboard manager"; homepage = "http://parcellite.sourceforge.net"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 1d0c4f2a9e74..108d4d5e0400 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ # Add your name here! diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 19a0df261695..156f03dad876 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility program to help you manage the disk devices"; homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ? - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 6af4511e8a37..6b4a0e3018fe 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; homepage = http://code.google.com/p/picocom/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 37636da72350..909ed0856bb9 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; + license = "nonfree"; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 1da0d70a14fa..031264f1edd0 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Cowsay reimplemention for ponies"; homepage = http://terse.tk/ponysay/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bodil ]; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index f5be7b8a46d8..993a36ea9092 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index d99fc1960ddd..a8b6e046a9b2 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "free"; + license = "Artistic-2"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index e798ee669e2f..f2f5f37ebe44 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/recutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index b679218db79b..fe0f3d646b86 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 5270ddad35e7..7bc4701bb2fd 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.oetiker.ch/rrdtool/; description = "High performance logging in Round Robin Databases"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 14cc6c4260f7..7880b3e883f3 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; - license = "unfree"; # I couldn't find its license, only a copyright. + license = stdenv.lib.licenses.unfree; # I couldn't find its license, only a copyright. description = "Steam Locomotive runs across your terminal when you type 'sl'"; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index c861fc6f73a3..f3c1c278c767 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Serial line sniffer"; homepage = http://slsnif.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 58f30a021fa3..a6afe475e3bd 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/stow/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 607674051549..5e473a5cd093 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.lcdf.org/type/; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... - license = "BSD-like"; + license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 73ac04dd34ec..fd237ac15f4a 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; longDescription = '' diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 05ab7cc7ae70..3a35e9a9f1cc 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { `time' reports unavailable information as zero values. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/time/; }; } diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index f8ad1fd4d15e..bf73dbcbf2fc 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/uucp/uucp.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index a3938c1af4c4..1c2c94ff89ca 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; homepage = http://wvware.sourceforge.net; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index cc9f98a94f60..93a2707d1e98 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 1014f11453b9..c830f1a3e2ee 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = http://people.debian.org/~kims/xclip/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index f6d6a2bacfa7..79c6a743bce4 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; + license = "free"; #TODO BSD on Gentoo, looks like MIT }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 635d94a3e864..df8677bfffaf 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 475d6775cde2..ce2ded24f823 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption crackign tools"; homepage = http://www.aircrack-ng.org/; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 34bdd153f3ab..cfd72098261c 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 00e747da7c7e..1f7c8a449f3d 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; description = "An small footprint implementation of the SSH 2 protocol"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index a47a0397bf5a..35cd66761329 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/filegive; description = "Easy p2p file sending program"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c9bc05658d03..f93221296125 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { stream audio or video content from all types of flash or rtmp servers. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://savannah.nongnu.org/projects/flvstreamer; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index e6b5cd9daabf..e7aabcd97554 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "GTK+-based FTP client"; homepage = http://www.gftp.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index d0821a4f5881..557fce6d94b3 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; homepage = http://sourceforge.net/projects/hyenae/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 7af7f73aad92..29f09b8cc197 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://imapproxy.org/; description = "It proxies IMAP transactions caching server connections"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index c2c1320988a7..1418ad63385c 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 99bc84882482..ce90bed30106 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 295cb0bf1391..20ee6da8a30c 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 132d1832a9d5..49753d189d63 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://jnettop.kubs.info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index ab43813f923b..b7146342b9f1 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.lysator.liu.se/~nisse/lsh/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 25dbd634c8c0..5c1910f1d6eb 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for Mega.co.nz"; homepage = http://megatools.megous.com/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e781af7c235a..5209e58ff246 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 1055ef90b124..87f0db1946b5 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of utilties for indexing and searching Maildirs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; platforms = stdenv.lib.platforms.mesaPlatforms; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b2943eb2aced..dffafe5c8169 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 16b8a1159b6a..5752ff2a63c1 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD"; + license = "BSD-Original"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 361d44eaca75..5c7840034b7f 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # /doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. - license = "BSD-like"; + license = "ngrep"; # Some custom BSD-style, see LICENSE.txt platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 7ef5eb17dc14..b3d4ec95e061 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://0pointer.de/lennart/projects/nss-mdns/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index d5fa2deb68dc..11e67ae63336 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.ntop.org/products/ntop/; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index c5386553f4f1..a97406ac7ed8 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://nzbget.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 666f3ad8ba71..b81c46c0b616 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; homepage = http://roy.marples.name/projects/openresolv; - license = "bsd"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ea94560219f0..fec6679a14b0 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; - license = "bsd"; + license = "bsd"; # multi BSD GPL-2 platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640 diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f06a36a96f5d..591bf26ff0b6 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; homepage = http://openvpn.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ac848b5d72e2..45a739247584 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { applications. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 835744c60004..8c707e2fcc72 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { web indexes as users can push content directly to search groups. ''; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; homepage = http://www.seeks-project.info/; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 6058639e412a..40d57cd65b63 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Permanent DNS caching"; homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 7a5b6b6c440d..fa3fc4472f3b 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/pdsh/"; description = "High-performance, parallel remote shell utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6778cf94907e..2835c9016ab4 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { description = "Proxifier for SOCKS proxies"; homepage = http://proxychains.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 63919edd5054..e2da224cfdcc 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://samy.pl/pwnat/; description = "ICMP NAT to NAT client-server communication"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index a057985b48cc..0c290db78a77 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Brute force attack against Wifi Protected Setup"; homepage = http://code.google.com/p/reaver-wps; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 48788d36884c..8390c70a4d3b 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; + license = "free-non-copyleft"; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 74e8a530560c..af1849565fe2 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://gna.org/projects/smbldap-tools/; description = "SAMBA LDAP tools"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index bf0c2f80694c..3e8f3ca3dc59 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { (well, not exactly true, SWEC will ignore robots.txt). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 88ee926e4065..36fdbfac7231 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/udptunnel/; description = "Tunnels TCP over UDP packets"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 54390d4f9eee..1da9ca969841 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.washington.edu/imap/; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = "Apache2"; + license = stdenv.lib.licenses.asl20; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 8619cd954090..1386f7133e54 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "virtual private network (VPN) client for Cisco's VPN concentrators"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 3f3a0dc89936..e32ee43113eb 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description="Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; homepage="http://vtun.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 837ab3627faf..4f8717e9a11e 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { power on. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index c86982155254..6ff5439c4bc6 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { scripts, cron jobs, terminals without X-Windows support, etc. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/wget/; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 381cb21ec1b2..291f7e36ce06 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A SOAP interface and client for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index d89ab7667e82..61e998fd545e 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A distributed deployment extension for Nix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 7420353499f5..65ae91f6e187 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d2f3ae6468c7..a1914224dbdb 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { description = "Automated deployment of mutable components and services for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix index 7c4a098cad8a..b4b3c98505e9 100644 --- a/pkgs/tools/package-management/guix/default.nix +++ b/pkgs/tools/package-management/guix/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { Guix is based on the Nix package manager. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 16a276273cc3..b2e86935b50d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ef673241c7ef..c27f78b31235 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 96de0e0fbe4a..dbbdb8e57a66 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "AES encrypting or decrypting pipe"; homepage = http://loop-aes.sourceforge.net/aespipe.README; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; maintainers = stdenv.lib.maintainers.goibhniu; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 458111be4006..42af2e0b57e8 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 0d4841bf036b..e6a63a2f2882 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://ccrypt.sourceforge.net/; description = "Utility for encrypting and decrypting files and streams with AES-256"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix index 3d7db862dce0..69a0a68319fd 100644 --- a/pkgs/tools/security/gnupg/git.nix +++ b/pkgs/tools/security/gnupg/git.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index a25ae35b6cc9..53f784396a72 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 31736123a9f2..0a96dbadff75 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; description = "Tools to use cryptography for things like four-eyes principles"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix index c9648fbe404d..ac9ccc592054 100644 --- a/pkgs/tools/security/muscletool/default.nix +++ b/pkgs/tools/security/muscletool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Smart card applications for use with MUSCLE plugins"; homepage = http://muscleapps.alioth.debian.org/; - license = "BSD"; + license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 4d1d55244c0b..038044ad6810 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index e693143e4c41..2a4995f45794 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { to the process. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 0254b143edfd..f8e76c4e83b1 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "use socks-friendly applications with Tor"; homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index cd9519590cc4..071504368b7f 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { execution statistics. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/acct/; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index c77890513656..2964db34e124 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = ''The classical Unix `at' job scheduling command''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://packages.qa.debian.org/at; }; } diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bc4bca887c80..4210a0a04a5a 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "collectd-5.4.1"; - + src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index d2ace27b1fd6..8117906585cc 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/ddrescue/ddrescue.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ iElectric ]; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 81206a132965..67b97ea75b15 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -27,4 +27,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 1bf18ed867c3..9764ae6ce0e4 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fakeroot.alioth.debian.org/; description = "Give a fake root environment through LD_PRELOAD"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 5a70843ff6bb..f546cd8f5ffc 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description="A command scheduler with extended capabilities over cron and anacron"; homepage = http://fcron.free.fr; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index e72497cf7c4e..9a4ac260ecc7 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cfdisk. It uses GNU Parted. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/fdisk/; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b4ddca4371e6..c408c0f34ea8 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 2bfa77164b81..21a67dba305c 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/freeipmi/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 93dfab9a1a47..0fe4cbc986c1 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index ab682c60921a..ea121b0e43c9 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; homepage = http://gt5.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index 1325b52b3808..d1631776d393 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://idle3-tools.sourceforge.net/; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 208ff837b346..88c9a4eecd1f 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; homepage = http://logcheck.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index b62340096027..964ee217108d 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 2b4f28fa868d..4bf958959961 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mcron/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3fe05e941b6c..d18c2737854a 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index a6a5fced8794..304d8f21eb28 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://safecopy.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 1a3bfa69d1ad..dc30c601750a 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/storebrowse; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 9102482d3d63..89bf06886518 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index afb6073b539e..f14d4affae79 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "command to produce a depth indented directory listing"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Tree is a recursive directory listing command that produces a diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index e056af26877c..2865e5b34826 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.urkud ]; }; } diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 05494e54a3ec..aaa458b05cb1 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.convertlit.com/; description = "A tool for converting Microsoft Reader ebooks to more open formats"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dc61723e5977..a87901eb5eb9 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 23223572bb23..14014d06052d 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Unicode variants, independently on language. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 7bb7060d5c2d..df49e5788eb5 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { it has many options that can be used to customize printouts. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/enscript/; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index b231f2875c09..e8c5472d2cb8 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lines of code. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index bdf19161e431..6e83bd357b27 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { prints the matching lines. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 1ad40a4a5fa0..7b38227cfcc1 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://savannah.gnu.org/projects/patch; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index cf30169acef1..b1c5910029dd 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { multiple occurrences of a string within a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index f4d3169f2fae..97cc3c611733 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; longDescription = '' diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index ea06a6255508..247cb67da56c 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -32,7 +32,7 @@ let date = "2009-07-04"; in used to validate and fix HTML data. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; homepage = http://tidy.sourceforge.net/; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 52781ed37927..eeac7b7f63fa 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://kdiff3.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with stdenv.lib.maintainers; [viric urkud]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 551d0b9f74a9..97fcd0629847 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.rc0.org.uk/mairix; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index dbf13a6332b5..d0e39add665a 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran data english-russian"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 45dcf922d8e8..3abe03b2a4ea 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: library for reading Multitran's BTREE database format"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 6dab8f86c327..0f5032c4a175 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: enchanced locale facets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index fe3e3b7317d2..b3e5f12407d8 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: main engine to query translations"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 3c77b50bee88..e73ba43791a9 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: basic useful functions"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index fb3856176d96..b03b1b110c4b 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran: simple command line utilities for dictionary maintainance"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21024c4aaad4..fba52b69fbaf 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { but also as a personal search system for email or other files. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 7c76c7f1bca2..a2d6e360a374 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://qshowdiff.danfis.cz/; description = "Colourful diff viewer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index fc7ee9f6f066..a2920345afa7 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index e30567000dd1..59b9b7bc13d1 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 21a866cf87e8..a7d1ddb0f3b5 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; homepage = http://www.gnu.org/software/src-highlite/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; longDescription = '' diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index c81e02b43995..9e62b2b3d592 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://billposer.org/Software/uni2ascii.html; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 3981f67aefb9..e6fc3510cd40 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; description = "GNU wdiff, comparing files on a word by word basis"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index b8f2f4696aea..fd5a5dc5f8e5 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = "free-non-copyleft"; + license = "free-non-copyleft"; #TODO W3C }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index ee66cf923774..6ec9758ed3a2 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp rxp $out/bin ''; meta = { - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; description = "a validating XML parser written in C"; homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index db7ebfbb77a8..aea3ab2bd968 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; homepage = http://xmlstar.sourceforge.net/; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 1769a59520ba..2ad9b0465658 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -33,7 +33,7 @@ buildPerlPackage { meta = { description = "Backend for BibLaTeX"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index d7d3f6f92a22..78dac0c6aa4e 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { into the traditional Unix man page format and the GNU Texinfo format. ''; - license = "MIT-style"; + license = stdenv.lib.licenses.mit; homepage = http://docbook2x.sourceforge.net/; }; } diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 5a2c5fb2e067..48d1ebfc2762 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Documentation production system for software manuals"; homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/; - license = "free"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ce531a920223..0dcd82535eeb 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 61e94d4d6185..c0fc43362971 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Wiki: http://lout.wiki.sourceforge.net/ homepage = http://savannah.nongnu.org/projects/lout/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 28a43e69598c..c71bc3ba77c6 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; homepage = http://www.accesspdf.com/pdftk/; - license = "free"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 054632533a11..8344735606ca 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { of pdfLaTeX to produce PDF documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 6993158291c2..a68ab2d01b9e 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index f903ef5792f4..69d02a275b34 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL"; # LaTeX Project Public License + license = "LPPL-1.2"; # LaTeX Project Public License }; } diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index bfc5efc73614..1b0602063e9e 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://fedorahosted.org/xmlto/; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index e4c8e99efdb6..faaea6aaffc4 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; }; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 2034331c8e0f..156fac03d09c 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://rtmpdump.mplayerhq.hu/; description = "Toolkit for RTMP streams"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 8e7fbdaeaf33..0f3b5f4d39db 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 806a0b210960..0a658a23e1cf 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Collection of SWF manipulation and creation utilities"; homepage = http://www.swftools.org/about.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 27f4ce4476fd..123dbf647f0d 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e9b62886fce8..1f04229c2c82 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon || (Ruby GPL-2) }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index a80ad91c4c30..34cfa662c916 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; #Amazon }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8433cec7f7..2054483f72d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -61,7 +61,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -126,7 +126,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -151,7 +151,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; description = "Compile a log format string to perl-code"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -175,7 +175,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -268,7 +268,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -296,7 +296,7 @@ let self = _self // overrides; _self = with self; { ''; homepage = http://www.aarontrevena.co.uk/opensource/autodia/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; @@ -310,7 +310,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Replace functions with ones that succeed or die with lexical scope"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -325,7 +325,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/autovivification/; description = "Lexically disable autovivification"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -344,7 +344,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -357,7 +357,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -397,7 +397,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/boolean-pm/tree; description = "Boolean support for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -419,7 +419,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BusinessISBNData URI ]; meta = { description = "Parse and validate ISBNs"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -431,7 +431,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Data pack for Business::ISBN"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -444,7 +444,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -456,7 +456,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Work with International Standard Serial Numbers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -552,7 +552,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Capture-Tiny; description = "Capture STDOUT and STDERR from Perl, XS or external programs"; - license = "apache_2_0"; + license = stdenv.lib.licenses.asl20; }; }; @@ -575,7 +575,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpAssert TestException ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -588,7 +588,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestException ]; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -611,7 +611,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ]; meta = { description = "Automated REST Method Dispatching"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -625,7 +625,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ]; meta = { description = "HTTP Basic and Digest authentication"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -651,7 +651,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -690,7 +690,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -704,7 +704,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose TextSimpleTable ]; meta = { description = "Regex DispatchType"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -734,7 +734,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "The Catalyst developer's manual"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -748,7 +748,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystDevel CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassCursorCached DBIxClassSchemaLoader HashMerge ListMoreUtils Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes namespaceautoclean namespaceclean TieIxHash TryTiny ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -764,7 +764,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -778,7 +778,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; meta = { description = "Request logging from within Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -792,7 +792,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -815,7 +815,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -829,7 +829,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; meta = { description = "Flexible caching support for Catalyst."; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -845,7 +845,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -882,7 +882,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; meta = { description = "Unicode aware Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -907,7 +907,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -940,7 +940,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; meta = { description = "Display a stack trace on the debug screen"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -954,7 +954,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; meta = { description = "Make serving static pages painless"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -978,7 +978,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; meta = { description = "JSON view for your data"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -991,7 +991,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; meta = { description = "Template View Class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1035,7 +1035,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = { description = "Replace the development server with Starman"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -1088,7 +1088,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1099,7 +1099,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1119,7 +1119,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1135,7 +1135,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; meta = { description = "Lets you build groups of accessors"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1164,7 +1164,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmC3 ]; meta = { description = "A pragma to use the C3 method resolution order algortihm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1179,7 +1179,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; description = "Make NEXT suck less"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1192,7 +1192,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1228,7 +1228,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Get information about a class and its structure"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1267,7 +1267,7 @@ let self = _self // overrides; _self = with self; { preConfigure = "patchShebangs ."; meta = { description = "A module for creating generic methods"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1281,7 +1281,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/sartak/Class-Method-Modifiers/tree; description = "Provides Moose-like method modifiers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1323,7 +1323,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A working (require \"Class::Name\") and more"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1338,7 +1338,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "XS implementation of parts of Class::Load"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -1359,7 +1359,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1371,7 +1371,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively copy Perl datatypes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1401,7 +1401,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Low-Level Interface to bzip2 compression library"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1438,7 +1438,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CaptureTiny ]; meta = { description = "A module to implement some of AutoConf macros in pure perl."; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1449,7 +1449,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1463,7 +1463,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1478,7 +1478,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/config-mvp; description = "Multivalue-property package-oriented configuration"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1492,7 +1492,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-MVP-Reader-INI; description = "An MVP config reader for .ini files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1583,7 +1583,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Read and write Changes files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1597,7 +1597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/cpan-meta; description = "The distribution metadata for a CPAN dist"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1612,7 +1612,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Verify requirements in a CPAN::Meta object"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1626,7 +1626,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/cpan-meta-requirements; description = "A set of version requirements for a CPAN dist"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1641,7 +1641,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/CPAN-Meta-YAML; description = "Read and write a subset of YAML for CPAN Meta files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1655,7 +1655,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/cpan-uploader; description = "Upload things to the CPAN"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1732,7 +1732,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1836,7 +1836,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1859,7 +1859,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Pretty printing of data structures"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1915,7 +1915,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rjbs/data-optlist; description = "Parse and validate simple name/value option pairs"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1938,7 +1938,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/data-section; description = "Read multiple hunks of data out of your DATA section"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1950,7 +1950,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Modules that serialize data structures"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1965,7 +1965,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1997,7 +1997,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; - license = "apache_2_0"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2060,7 +2060,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; meta = { description = "A date and time object"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2095,7 +2095,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2108,7 +2108,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ]; meta = { description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2121,7 +2121,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2134,7 +2134,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format iCal datetime and duration strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2147,7 +2147,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2163,7 +2163,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2176,7 +2176,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2191,7 +2191,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format strp and strf time patterns"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2205,7 +2205,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://datetime.perl.org/; description = "Localization support for DateTime.pm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2232,7 +2232,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; meta = { description = "Time zone object base class and factory"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2246,7 +2246,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; meta = { description = "Parse a date/time string using the best method available"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2259,7 +2259,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding."; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2272,7 +2272,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2295,7 +2295,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/timbunce/devel-sizeme; description = "Unknown"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2340,7 +2340,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2356,7 +2356,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2369,7 +2369,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ]; meta = { description = "Sugar for your favorite ORM, DBIx::Class"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2383,7 +2383,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan DBIxClass ]; meta = { description = "Cursor class with built-in caching support"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2405,7 +2405,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ]; meta = { description = "Simplify the common case stuff for DBIx::Class."; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2418,7 +2418,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClass ]; meta = { description = "Introspect many-to-many relationships"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2432,7 +2432,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2447,7 +2447,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2490,7 +2490,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2506,7 +2506,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2519,7 +2519,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = http://search.cpan.org/dist/Devel-GlobalDestruction; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2553,7 +2553,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An object representing a stack trace"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2566,7 +2566,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "Displays stack trace in HTML"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2597,7 +2597,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2609,7 +2609,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2647,7 +2647,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Perl interface to the SHA-1 algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2662,7 +2662,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Declare version conflicts for your dist"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2677,7 +2677,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; doCheck = false; }; @@ -2693,7 +2693,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2706,7 +2706,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2720,7 +2720,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; description = "Release tests for source encoding"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2734,7 +2734,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests; description = "Release tests making sure hard tabs aren't used"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2749,7 +2749,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; description = "Weave your Pod together from configuration and Dist::Zilla"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2764,7 +2764,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; description = "Automatically convert POD to a README in any format for Dist::Zilla"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2779,7 +2779,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2794,7 +2794,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2809,7 +2809,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; description = "Release tests for your META.json"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2824,7 +2824,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/; description = "Common tests to check syntax of your modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2839,7 +2839,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2854,7 +2854,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/; description = "Author tests making sure correct line endings are used"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2869,7 +2869,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee; description = "Release tests for kwalitee"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2884,7 +2884,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2899,7 +2899,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/; description = "Tests to check your code against best practices"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2913,7 +2913,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; description = "Add release tests for POD links"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2928,7 +2928,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2943,7 +2943,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2958,7 +2958,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2973,7 +2973,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/; description = "Release Test::Version tests"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2985,7 +2985,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailSimple MROCompat ]; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2998,7 +2998,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "RFC 2822 Address Parsing"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3010,7 +3010,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Produce RFC 8822 date strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3023,7 +3023,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3037,7 +3037,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3051,7 +3051,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Parse a MIME Content-Type Header"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3064,7 +3064,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fac34g44sn0l59wim68zrhih1mvlh1rxvyn3gc5pviaiz028lyy"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3089,7 +3089,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/email-sender; description = "A library for sending email"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3102,7 +3102,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailDateFormat ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3132,7 +3132,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "EucJP-ascii - An eucJP-open mapping"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3144,7 +3144,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Extra sets of Chinese encodings"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -3197,7 +3197,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Safely and cleanly create closures via string eval"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3262,7 +3262,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3275,7 +3275,7 @@ let self = _self // overrides; _self = with self; { sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3296,7 +3296,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A wrapper for perl's configuration"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3316,7 +3316,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3330,7 +3330,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Various portability utilities for module builders"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3343,7 +3343,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Build.PL install path logic made easy"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3355,7 +3355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A tool to build C libraries."; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3370,7 +3370,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; description = "Create a module Makefile"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3460,7 +3460,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3551,7 +3551,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { description = "Common rules for searching for Perl things"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3564,7 +3564,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; preCheck = "export HOME=$TMPDIR"; }; @@ -3649,7 +3649,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3664,7 +3664,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3676,7 +3676,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Install shared files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3690,7 +3690,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and dumb file system watcher"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3704,7 +3704,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3756,7 +3756,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3803,7 +3803,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ GD ]; meta = { description = "Security image (captcha) generator"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3835,7 +3835,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3863,7 +3863,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ]; meta = { description = "Simple interface to Google Protocol Buffers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3947,7 +3947,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3959,7 +3959,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Store multiple values per key"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4026,7 +4026,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; meta = { description = "Class that represents an HTML form element"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4062,7 +4062,7 @@ let self = _self // overrides; _self = with self; { description = "HTML forms using Moose"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4075,7 +4075,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTagset ]; meta = { description = "HTML parser class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4155,7 +4155,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Work with HTML in a DOM-like tree structure"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4168,7 +4168,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; meta = { description = "Add XPath support to HTML::TreeBuilder"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4197,7 +4197,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4210,7 +4210,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage ]; meta = { description = "HTTP cookie jars"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4223,7 +4223,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; meta = { description = "A simple http server class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4235,7 +4235,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Date conversion routines"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4264,7 +4264,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style messages"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4277,7 +4277,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Choose a variant to serve"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4319,7 +4319,7 @@ let self = _self // overrides; _self = with self; { }; doCheck = false; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4351,7 +4351,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4375,7 +4375,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; doCheck = !stdenv.isDarwin; }; @@ -4398,7 +4398,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Open an HTML file with automatic charset detection"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4410,7 +4410,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Utilities for interactive I/O"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4450,7 +4450,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/noxxi/p5-io-socket-ssl; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; doCheck = false; # tries to connect to facebook.com etc. }; @@ -4482,7 +4482,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4506,7 +4506,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4577,7 +4577,7 @@ let self = _self // overrides; _self = with self; { for immediate access from Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; maintainers = [ ]; }; @@ -4609,7 +4609,7 @@ let self = _self // overrides; _self = with self; { available to the Perl program as if they had been written in Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; maintainers = [ ]; }; @@ -4632,7 +4632,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4645,7 +4645,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4657,7 +4657,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "JSON::XS compatible pure-Perl module"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4669,7 +4669,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Helper module in using JSON::PP in Perl 5.6"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4779,7 +4779,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4801,7 +4801,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Provide the stuff missing in List::Util"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4884,7 +4884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { description = "Simple logging interface with a contextual log"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4899,7 +4899,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ParamsValidate ]; meta = { description = "Dispatches messages to one or more outputs"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4932,7 +4932,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatch-array; description = "Log events to an array (reference)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4947,7 +4947,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatchouli; description = "A simple wrapper around Log::Dispatch"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4961,7 +4961,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to start a daemon meta = { description = "The World-Wide Web library for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4973,7 +4973,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Guess media type for a file or a URL"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4990,7 +4990,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5003,7 +5003,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = { description = "The World-Wide Web library for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5184,7 +5184,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5207,7 +5207,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FennecLite TestException ]; meta = { description = "Tools for creating Meta objects to track custom metrics"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5222,7 +5222,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelDeclare ]; meta = { description = "Basic method declarations with signatures, without source filters"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5261,7 +5261,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Charset Information for MIME"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5282,7 +5282,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Definition of MIME types"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5296,7 +5296,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5310,7 +5310,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/Modern-Perl; description = "Enable all of the features of Modern Perl with one import"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5323,7 +5323,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5337,7 +5337,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ]; meta = { description = "A tiny replacement for Module::Build"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5359,7 +5359,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.perl.org/; description = "What modules shipped with versions of perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5371,7 +5371,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Find and use installed modules in a (sub)category"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5386,7 +5386,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Loads one of several alternate underlying implementations for a module"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -5399,7 +5399,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5413,7 +5413,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5426,7 +5426,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Declare author-only dependencies"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5441,7 +5441,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Designate tests only run by module authors"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5457,7 +5457,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil ]; meta = { description = "Parse and examine a Perl distribution MANIFEST file"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5479,7 +5479,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DevelFindPerl ]; meta = { description = "Get the full path to a locally installed module"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5495,7 +5495,7 @@ let self = _self // overrides; _self = with self; { ]; meta = { description = "Automatically give your module the ability to have plugins"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5517,7 +5517,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5529,7 +5529,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively scan Perl code for dependencies"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5542,7 +5542,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5568,7 +5568,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://mojolicio.us; description = "Real-time web framework"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -5582,7 +5582,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ]; meta = { description = "Minimalist Object Orientation (with Moose compatiblity)"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5597,7 +5597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A postmodern object system for Perl 5"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5611,7 +5611,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5626,7 +5626,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5653,7 +5653,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5678,7 +5678,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5707,7 +5707,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ]; meta = { description = "An abstract Moose role for setting attributes from a configfile"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5723,7 +5723,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; meta = { description = "Role for daemonizing your Moose based application"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5737,7 +5737,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceclean ]; meta = { description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5752,7 +5752,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Getopt; description = "A Moose role for processing command line options"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5767,7 +5767,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5784,7 +5784,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/MooseX-Has-Sugar; description = "Sugar Syntax for moose 'has' fields"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5799,7 +5799,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; description = "Required attributes which fail only when trying to use them"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5814,7 +5814,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; - license = "lgpl_2_1"; + license = stdenv.lib.licenses.lgpl21; }; }; @@ -5829,7 +5829,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5843,7 +5843,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils Moose ]; meta = { description = "Easy subclassing of non-Moose classes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5858,7 +5858,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/moosex-oneargnew; description = "Teach ->new to accept single, non-hashref arguments"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5882,7 +5882,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; meta = { description = "An extension of Params::Validate using Moose's types"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5897,7 +5897,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5912,7 +5912,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5972,7 +5972,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6008,7 +6008,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Organise your Moose types in libraries"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6049,7 +6049,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; meta = { description = "Extensions to MooseX::Types::DateTime"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6075,7 +6075,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6105,7 +6105,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; meta = { description = "Moose types that check against Perl syntax"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6137,7 +6137,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6186,7 +6186,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6225,7 +6225,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/namespace-autoclean; description = "Keep imports out of your namespace"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6239,7 +6239,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/namespace-clean; description = "Keep imports and functions out of your namespace"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6312,7 +6312,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6325,7 +6325,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6341,7 +6341,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ]; meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6365,7 +6365,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6398,7 +6398,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Low-level HTTP connection (client)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6432,7 +6432,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; meta = { description = "An implementation of the OAuth protocol"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6446,7 +6446,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ]; meta = { description = "An Asynchronous and multi channel Perl AMQP client"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6527,7 +6527,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/semifor/Net-Twitter-Lite; description = "A perl interface to the Twitter API"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6556,7 +6556,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Comprehensive inside-out object support module"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6607,7 +6607,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Manage deprecation warnings for your distribution"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6622,7 +6622,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6636,7 +6636,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6658,7 +6658,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Simple, compact and correct param-checking functions"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6673,7 +6673,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Validate method/function parameters"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6706,7 +6706,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; description = "Parse META.yml and META.json CPAN metadata files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6726,7 +6726,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cross-platform path specification manipulation"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6774,7 +6774,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6855,7 +6855,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6869,7 +6869,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir ModuleVersions Plack TextMicroTemplate ]; meta = { description = "Display information about the current request/response"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6884,7 +6884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack ]; meta = { description = "Supports app to run as a reverse proxy backend"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6897,7 +6897,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage LWPUserAgent Plack TestTCP URI ]; meta = { description = "Run HTTP tests on external live servers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6911,7 +6911,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; meta = { description = "Parse, Analyze and Manipulate Perl (without perl)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; doCheck = false; }; @@ -6925,7 +6925,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; meta = { description = "Parse regular expressions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6939,7 +6939,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; meta = { description = "Extensions to L"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6988,7 +6988,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ]; meta = { description = "Find a minimum required version of perl for Perl code"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7003,7 +7003,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/perl-prereqscanner; description = "A tool to scan your Perl code for its prerequisites"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7016,7 +7016,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp ]; meta = { description = "Parse and manipulate Perl version strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7039,7 +7039,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-coverage-trustpod; description = "Allow a module's pod to contain Pod::Coverage hints"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7054,7 +7054,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental; description = "Work with nestable Pod elements"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7069,7 +7069,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental-perlmunger; description = "A thing that takes a string of Perl and rewrites its documentation"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7090,7 +7090,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MixinLinewise TestDeep ]; meta = { description = "Read a POD document as a series of trivial events"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7118,7 +7118,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rwstauner/Pod-Markdown; description = "Convert POD to Markdown"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7150,7 +7150,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-weaver; description = "Weave together a Pod document from an outline"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7189,7 +7189,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Redis/; description = "Perl binding for Redis database"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7242,7 +7242,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7276,7 +7276,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ]; meta = { description = "A thing with a message method"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7290,7 +7290,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7303,7 +7303,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal ]; meta = { description = "Roles, like a nouvelle cuisine portion size slice of Moose"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7329,7 +7329,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Call isa, can, does and DOES safely on things that may not be objects"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7349,7 +7349,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Lexically-scoped resource management"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7362,7 +7362,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Scope-Upper/; description = "Act on upper scopes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7392,7 +7392,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7415,7 +7415,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7440,7 +7440,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/software-license; description = "Packages that provide templated software licenses"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7481,7 +7481,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; meta = { description = "Generate SQL from Perl data structures"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7540,7 +7540,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/miyagawa/Starman; description = "High-performance preforking PSGI/Plack web server"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7567,7 +7567,7 @@ let self = _self // overrides; _self = with self; { meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7597,7 +7597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://plackperl.org; description = "Temporary buffer to save bytes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7610,7 +7610,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; description = "Turn on strict and make all warnings fatal"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7644,7 +7644,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; meta = { description = "A simple sprintf-like dialect"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7670,7 +7670,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/string-flogger; description = "String munging for loggers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7713,7 +7713,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Rewrite strings based on a set of known prefixes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7748,7 +7748,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { description = "A module for when strings are too long to be displayed in.."; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7762,7 +7762,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7776,7 +7776,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "String::Util -- String processing utilities"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7790,7 +7790,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7803,7 +7803,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubName ]; meta = { description = "Helper routines for using Sub::Exporter to build methods"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7817,7 +7817,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter-globexporter; description = "Export shared globs with Sub::Exporter collectors"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7830,7 +7830,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Only use Sub::Exporter if you need it"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7844,7 +7844,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7865,7 +7865,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Install subroutines into packages easily"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7898,7 +7898,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/sub-uplevel; description = "Apparently run a function in a higher stack frame"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7971,7 +7971,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/phaylon/syntax/wiki; description = "Activate syntax extensions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7984,7 +7984,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ]; meta = { description = "Perl6 style Junction operators in Perl5"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8006,7 +8006,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; description = "Stream TAP from pgTAP test scripts"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ ocharles ]; }; @@ -8052,7 +8052,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ensure that a platform has weaken support"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8079,7 +8079,7 @@ let self = _self // overrides; _self = with self; { meta = { maintainers = with maintainers; [ eelco ]; description = "Perl Template Toolkit Plugin for IO::All"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8131,7 +8131,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8143,7 +8143,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Detect encoding of the current terminal"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8157,7 +8157,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8170,7 +8170,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; meta = { description = ""; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8279,7 +8279,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8291,7 +8291,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Validate your CPAN META.yml files"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -8316,7 +8316,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TextDiff ]; meta = { description = "Test strings and data structures and show differences if not ok"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8331,7 +8331,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-DistManifest; description = "Author test that validates a package MANIFEST"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8344,7 +8344,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8385,7 +8385,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/test-fatal; description = "Incredibly simple helpers for testing code with exceptions"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8400,7 +8400,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8495,7 +8495,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A postmodern object system for Perl 5"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8516,7 +8516,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Test-Mojibake; description = "Check your source for encoding misbehavior"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8531,7 +8531,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; meta = { description = "Most commonly needed test functions and features"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8543,7 +8543,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check the presence of tabs in your project"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8599,7 +8599,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod/; description = "Check for POD errors in files"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8623,7 +8623,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/; description = "Tests POD for invalid links"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8635,7 +8635,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check file names portability"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8647,7 +8647,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Checks to see if the module can be loaded"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8662,7 +8662,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8704,7 +8704,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test your SYNOPSIS code"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8716,7 +8716,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Write tests, not scripts that run them"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8731,7 +8731,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8751,7 +8751,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unit testing without external dependencies"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8780,7 +8780,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Perl extension to test methods for warnings"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8794,7 +8794,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8806,7 +8806,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test fallback behaviour in absence of modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8822,7 +8822,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/petdance/test-www-mechanize; description = "Testing-specific WWW::Mechanize subclass"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -8836,7 +8836,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8862,7 +8862,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8899,7 +8899,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interface to read and parse BibTeX files"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8920,7 +8920,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmDiff ]; meta = { description = "Perform diffs on files and record sets"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8940,7 +8940,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Framework for more readable interactive test scripts"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8963,7 +8963,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ]; meta = { description = "Spy on objects to achieve test doubles (mock testing)"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8979,7 +8979,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ]; meta = { description = "Does your code require newer perl than you think?"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8991,7 +8991,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Micro template engine with Perl5 language"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9029,7 +9029,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple eyecandy ASCII tables"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9079,7 +9079,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc."; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9092,7 +9092,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/gfx/p5-Test-Vars; description = "Detects unused variables"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9107,7 +9107,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Version/; description = "Check to see that version's in modules are sane"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9119,7 +9119,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Remove leading and/or trailing whitespace from strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9175,7 +9175,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cycle through a list of values via a scalar"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9187,7 +9187,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered associative arrays for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9199,7 +9199,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered hashes for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9229,7 +9229,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9243,7 +9243,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExporterLite ]; meta = { description = "Parse string that represents time duration"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9265,7 +9265,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An N-ary tree"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9278,7 +9278,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; meta = { description = "A simple tree object"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9320,7 +9320,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/UNIVERSAL-isa; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9332,7 +9332,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Require() modules from a variable"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9355,7 +9355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unicode Collation Algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9367,7 +9367,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Wrapper around ICU collation services"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9383,7 +9383,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MIMECharset ]; meta = { description = "UAX #14 Unicode Line Breaking Algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9403,7 +9403,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9417,7 +9417,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/URI-Find; description = "Find URIs in arbitrary text"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9430,7 +9430,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsValidate URI ]; meta = { description = "Build a URI from a set of named parameters"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9453,7 +9453,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9522,7 +9522,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/bestpractical/www-mechanize; description = "Handy web browsing in a Perl object"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9552,7 +9552,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; meta = { description = "Database of robots.txt-derived permissions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9619,7 +9619,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9738,7 +9738,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/yaml-pm/tree; description = "YAML Ain't Markup Language (tm)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9751,7 +9751,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/YAML-Syck; description = "Fast, lightweight YAML loader and dumper"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index ca980e386373..e76cf4988d02 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -142,7 +142,7 @@ in BTree-based folder implementation with order support ''; homepage = "http://pypi.python.org/pypi/plone.folder"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -162,7 +162,7 @@ in The Plone Content Management System (core) ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -182,7 +182,7 @@ in Waitress WSGI server ''; homepage = "https://github.com/Pylons/waitress"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -202,7 +202,7 @@ in zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. ''; homepage = "http://pypi.python.org/pypi/zope.deferredimport"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -222,7 +222,7 @@ in Python 2 and 3 compatibility utilities ''; homepage = "http://pypi.python.org/pypi/six/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -242,7 +242,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -262,7 +262,7 @@ in Uid product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFUid"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -322,7 +322,7 @@ in A referencebrowser implementation for Archetypes ''; homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -342,7 +342,7 @@ in An extension to zope.formlib, which allows to group fields into different fieldsets. ''; homepage = "http://pypi.python.org/pypi/plone.fieldsets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -362,7 +362,7 @@ in redirection tool ''; homepage = "http://pypi.python.org/pypi/plone.app.redirector"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -402,7 +402,7 @@ in ZODB blob support for Plone ''; homepage = "http://plone.org/products/plone.app.blob"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -444,7 +444,7 @@ in Programmable browser for functional black-box tests ''; homepage = "http://pypi.python.org/pypi/zope.testbrowser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -464,7 +464,7 @@ in Full text indexing for ZCatalog / Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -504,7 +504,7 @@ in Local registries for zope component architecture ''; homepage = "http://pypi.python.org/pypi/zope.site"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -524,7 +524,7 @@ in Plone's content menu implementation ''; homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -584,7 +584,7 @@ in Structured Configuration Library ''; homepage = "http://www.zope.org/Members/fdrake/zconfig/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -604,7 +604,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -664,7 +664,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -704,7 +704,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -724,7 +724,7 @@ in Component vocabularies ''; homepage = "http://pypi.python.org/pypi/zope.componentvocabulary"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -744,7 +744,7 @@ in Zope Content Management Framework core components ''; homepage = "http://pypi.python.org/pypi/Products.CMFCore"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -824,7 +824,7 @@ in Special MultiMapping objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/MultiMapping"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -844,7 +844,7 @@ in SQL method support for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -906,7 +906,7 @@ in Buildout recipe for creating a Zope 2 instance ''; homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -926,7 +926,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -966,7 +966,7 @@ in Zope process lifetime events ''; homepage = "http://pypi.python.org/pypi/zope.processlifetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -986,7 +986,7 @@ in Default product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1006,7 +1006,7 @@ in zope.formlib integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1106,7 +1106,7 @@ in Load, configure, and compose WSGI applications and servers ''; homepage = "http://pythonpaste.org/deploy/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1126,7 +1126,7 @@ in The default theme for Plone 4. ''; homepage = "http://pypi.python.org/pypi/plonetheme.sunburst"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1166,7 +1166,7 @@ in Sequence Sorting ''; homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1206,7 +1206,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1226,7 +1226,7 @@ in Zope publication ''; homepage = "http://pypi.python.org/pypi/zope.app.publication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1246,7 +1246,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1266,7 +1266,7 @@ in Content Views for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.content"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1306,7 +1306,7 @@ in Zope External Editor ''; homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1386,7 +1386,7 @@ in A source query widget for z3c.form. ''; homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1406,7 +1406,7 @@ in DCWorkflow product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1470,7 +1470,7 @@ in Zope Template Application Language Expression Syntax (TALES) ''; homepage = "http://pypi.python.org/pypi/zope.tales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1510,7 +1510,7 @@ in This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. ''; homepage = "http://pypi.python.org/pypi/DateTime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1530,7 +1530,7 @@ in Special Missing objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Missing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1570,7 +1570,7 @@ in World timezone definitions, modern and historical ''; homepage = "http://pytz.sourceforge.net"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1590,7 +1590,7 @@ in Zope Configuration Markup Language (ZCML) ''; homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1610,7 +1610,7 @@ in check-out/check-in staging for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.iterate"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1670,7 +1670,7 @@ in zope.sendmail integration for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.MailHost"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1690,7 +1690,7 @@ in Zope Broken Object Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.broken"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1710,7 +1710,7 @@ in Document Templating Markup Language (DTML) ''; homepage = "http://pypi.python.org/pypi/DocumentTemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1730,7 +1730,7 @@ in Provides support for restricted execution of Python scripts in Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1810,7 +1810,7 @@ in Formlib-based controlpanels for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1830,7 +1830,7 @@ in Screen-scraping library ''; homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1850,7 +1850,7 @@ in WSGI request and response object ''; homepage = "http://webob.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1870,7 +1870,7 @@ in An error reporting utility for Zope3 ''; homepage = "http://pypi.python.org/pypi/zope.error"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1890,7 +1890,7 @@ in Plone OpenID authentication support ''; homepage = "http://pypi.python.org/pypi/plone.app.openid"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1930,7 +1930,7 @@ in Plone integration for the basic plone.portlets package ''; homepage = "http://pypi.python.org/pypi/plone.app.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1990,7 +1990,7 @@ in Persistent ExtensionClass ''; homepage = "http://pypi.python.org/pypi/Persistence"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2030,7 +2030,7 @@ in Flexible CMF content ''; homepage = "http://code.google.com/p/dexterity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2050,7 +2050,7 @@ in Recipe for installing Python package distributions as eggs ''; homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2090,7 +2090,7 @@ in Enhanced emailing handlers for the python logging package. ''; homepage = "http://www.simplistix.co.uk/software/python/mailinglogger"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -2110,7 +2110,7 @@ in A BTree based implementation for Zope 2's OFS. ''; homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2130,7 +2130,7 @@ in webdav locking support ''; homepage = "http://pypi.python.org/pypi/plone.locking"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2150,7 +2150,7 @@ in configurable viewlet manager ''; homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2170,7 +2170,7 @@ in Zope testing framework, including the testrunner script. ''; homepage = "http://pypi.python.org/pypi/zope.testing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2190,7 +2190,7 @@ in Object life-cycle events ''; homepage = "http://pypi.python.org/pypi/zope.lifecycleevent"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2210,7 +2210,7 @@ in User-configurable, blob-aware image scaling for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.imaging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2230,7 +2230,7 @@ in Plone integration for plone.contentrules ''; homepage = "http://pypi.python.org/pypi/plone.app.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2270,7 +2270,7 @@ in Zope Page Templates ''; homepage = "http://pypi.python.org/pypi/zope.pagetemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2290,7 +2290,7 @@ in A package for all things users and groups related (specific to plone) ''; homepage = "http://pypi.python.org/pypi/plone.app.users"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2310,7 +2310,7 @@ in System for managing development buildouts ''; homepage = "http://pypi.python.org/pypi/zc.buildout"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2350,7 +2350,7 @@ in ZODB undo support for Zope2. ''; homepage = "http://pypi.python.org/pypi/ZopeUndo"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2370,7 +2370,7 @@ in Zope 3 Template Application Languate (TAL) ''; homepage = "http://pypi.python.org/pypi/zope.tal"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2390,7 +2390,7 @@ in General Zope 2 help screens. ''; homepage = "http://pypi.python.org/pypi/Products.OFSP"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2452,7 +2452,7 @@ in Zope Container ''; homepage = "http://pypi.python.org/pypi/zope.container"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2492,7 +2492,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2512,7 +2512,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2532,7 +2532,7 @@ in zExceptions contains common exceptions used in Zope2. ''; homepage = "http://pypi.python.org/pypi/zExceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2572,7 +2572,7 @@ in The Zope publisher publishes Python objects on the web. ''; homepage = "http://pypi.python.org/pypi/zope.publisher"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2592,7 +2592,7 @@ in ZCML directives for configuring browser views for Zope. ''; homepage = "http://pypi.python.org/pypi/zope.browserpage/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2612,7 +2612,7 @@ in Plone specific i18n extensions. ''; homepage = "http://pypi.python.org/pypi/plone.app.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2632,7 +2632,7 @@ in Zope Security Framework ''; homepage = "http://pypi.python.org/pypi/zope.security"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2652,7 +2652,7 @@ in Cache purging support for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.cachepurging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2694,7 +2694,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2714,7 +2714,7 @@ in Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. ''; homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2774,7 +2774,7 @@ in Zope Viewlets ''; homepage = "http://pypi.python.org/pypi/zope.viewlet"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2834,7 +2834,7 @@ in Zope Internationalization Support ''; homepage = "http://pypi.python.org/pypi/zope.i18n"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2876,7 +2876,7 @@ in A backend for ZODB that stores pickles in a relational database. ''; homepage = "http://pypi.python.org/pypi/RelStorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2896,7 +2896,7 @@ in zope.formlib integration for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2978,7 +2978,7 @@ in Upgrade machinery for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3018,7 +3018,7 @@ in Provides transforms from text/x-web-intelligent to text/html and vice versa. ''; homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3038,7 +3038,7 @@ in Zope contenttype ''; homepage = "http://pypi.python.org/pypi/zope.contenttype"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3058,7 +3058,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3098,7 +3098,7 @@ in Zope sendmail ''; homepage = "http://pypi.python.org/pypi/zope.sendmail"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3118,7 +3118,7 @@ in Object annotation mechanism ''; homepage = "http://pypi.python.org/pypi/zope.annotation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3138,7 +3138,7 @@ in Integrate five.customerize into Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.customerize/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3218,7 +3218,7 @@ in File-system Representation Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.filerepresentation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3238,7 +3238,7 @@ in Decorators for caching the values of functions and methods ''; homepage = "http://pypi.python.org/pypi/plone.memoize"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3258,7 +3258,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3278,7 +3278,7 @@ in Interfaces and simple adapter that give the size of an object ''; homepage = "http://pypi.python.org/pypi/zope.size"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3298,7 +3298,7 @@ in TTW customization of template-based Zope views ''; homepage = "http://pypi.python.org/pypi/five.customerize"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3318,7 +3318,7 @@ in Resolver for Python dotted names. ''; homepage = "http://pypi.python.org/pypi/zope.dottedname"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3358,7 +3358,7 @@ in Translation files for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.locales"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3378,7 +3378,7 @@ in z3c.form date and datetime widgets ''; homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3398,7 +3398,7 @@ in Listing of content for the Plone CMS ''; homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3418,7 +3418,7 @@ in Zope2 application server / web framework ''; homepage = "http://zope2.zope.org"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3458,7 +3458,7 @@ in This package provides support for external Python methods within a Zope 2 environment. ''; homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3478,7 +3478,7 @@ in Browser layer management for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.browserlayer"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3498,7 +3498,7 @@ in workflow and security settings for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3518,7 +3518,7 @@ in Integration package for `plone.folder` into Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.folder/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3538,7 +3538,7 @@ in Basic inter-process locks ''; homepage = "http://www.python.org/pypi/zc.lockfile"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3558,7 +3558,7 @@ in Cache managers for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3578,7 +3578,7 @@ in RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. ''; homepage = "http://pypi.python.org/pypi/RestrictedPython"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3598,7 +3598,7 @@ in Adaptable string interpolation ''; homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3618,7 +3618,7 @@ in A RAM-based storage for ZODB ''; homepage = "http://pypi.python.org/pypi/tempstorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3658,7 +3658,7 @@ in Zope datetime ''; homepage = "http://pypi.python.org/pypi/zope.datetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3698,7 +3698,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3718,7 +3718,7 @@ in UNKNOWN ''; homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -3738,7 +3738,7 @@ in Zope locale extraction and management utilities ''; homepage = "http://pypi.python.org/pypi/zope.app.locales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3778,7 +3778,7 @@ in Zope Content Type ''; homepage = "http://cheeseshop.python.org/pypi/zope.app.content"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3818,7 +3818,7 @@ in MIMETools provides the <!--#mime--> tag for DocumentTemplate. ''; homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3878,7 +3878,7 @@ in Advanced i18n/l10n features ''; homepage = "http://pypi.python.org/pypi/plone.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3938,7 +3938,7 @@ in Zope Object Database: object database and persistence ''; homepage = "UNKNOWN"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3958,7 +3958,7 @@ in jQuery integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.jquery"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3998,7 +3998,7 @@ in Plone ContentRules Engine ''; homepage = "http://pypi.python.org/pypi/plone.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4038,7 +4038,7 @@ in Message Identifiers for internationalization ''; homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4058,7 +4058,7 @@ in Transaction management for Python ''; homepage = "http://www.zope.org/Products/ZODB"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4078,7 +4078,7 @@ in Method and property caching decorators ''; homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4098,7 +4098,7 @@ in Tools for managing themes in CMF and Plone sites ''; homepage = "http://pypi.python.org/pypi/plone.theme"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4138,7 +4138,7 @@ in Zope 2's indexing and search solution. ''; homepage = "http://pypi.python.org/pypi/Products.ZCatalog"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4178,7 +4178,7 @@ in Layout mechanisms for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4246,7 +4246,7 @@ in Plone UI and default rules for plone.caching/z3c.caching ''; homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4266,7 +4266,7 @@ in Zope Exceptions ''; homepage = "http://cheeseshop.python.org/pypi/zope.exceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4286,7 +4286,7 @@ in plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. ''; homepage = "http://pypi.python.org/pypi/plone.z3cform"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4306,7 +4306,7 @@ in Security framework for Zope2. ''; homepage = "http://pypi.python.org/pypi/AccessControl"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4326,7 +4326,7 @@ in Special Record objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Record"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4386,7 +4386,7 @@ in Registry for managing CSS and JS ''; homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4426,7 +4426,7 @@ in Convenience uid/gid helper function used in Zope2. ''; homepage = "http://pypi.python.org/pypi/initgroups"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4446,7 +4446,7 @@ in Daemon process control library and tools for Unix-based systems ''; homepage = "http://www.python.org/pypi/zdaemon"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4466,7 +4466,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/plone.app.querystring"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4506,7 +4506,7 @@ in Definition of authentication basics for the Zope Framework ''; homepage = "http://pypi.python.org/pypi/zope.authentication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4566,7 +4566,7 @@ in A portlet that fetches results from a collection ''; homepage = "http://pypi.python.org/pypi/plone.portlet.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4586,7 +4586,7 @@ in Shared Zope Toolkit browser components ''; homepage = "http://pypi.python.org/pypi/zope.browser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4606,7 +4606,7 @@ in This package adds 'saved search' functionality to Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4626,7 +4626,7 @@ in Calendar product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFCalendar"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4648,7 +4648,7 @@ in The Plone Content Management System ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4668,7 +4668,7 @@ in Pluggable Zope2 authentication / authorization framework ''; homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4708,7 +4708,7 @@ in jQuery Tools integration for Plone plus overlay and AJAX form helpers. ''; homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4728,7 +4728,7 @@ in Read Zope configuration state from profile dirs / tarballs ''; homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4748,7 +4748,7 @@ in Metaclass for subclassable extension types ''; homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4788,7 +4788,7 @@ in StructuredText parser ''; homepage = "http://pypi.python.org/pypi/zope.structuredtext"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4808,7 +4808,7 @@ in Zope RAM Cache ''; homepage = "http://pypi.python.org/pypi/zope.ramcache"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4828,7 +4828,7 @@ in Resolving paths in the object hierarchy ''; homepage = "http://pypi.python.org/pypi/zope.traversing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4848,7 +4848,7 @@ in Content Provider Framework for Zope Templates ''; homepage = "http://pypi.python.org/pypi/zope.contentprovider"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4868,7 +4868,7 @@ in The classic Plone 3 default theme. ''; homepage = "http://pypi.python.org/pypi/plonetheme.classic"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4908,7 +4908,7 @@ in A simple static HTML portlet for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4948,7 +4948,7 @@ in An extension of zope.viewlet to support dynamic portlets ''; homepage = "http://pypi.python.org/pypi/plone.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4968,7 +4968,7 @@ in Configure application plugins based on interfaces ''; homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5008,7 +5008,7 @@ in A general logging facility ''; homepage = "http://cheeseshop.python.org/pypi/zLOG"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5028,7 +5028,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5068,7 +5068,7 @@ in Form generation and validation library for Zope ''; homepage = "http://pypi.python.org/pypi/zope.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5088,7 +5088,7 @@ in Pluggable object copying mechanism ''; homepage = "http://pypi.python.org/pypi/zope.copy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5108,7 +5108,7 @@ in A collection of generally useful vocabularies. ''; homepage = "https://github.com/plone/plone.app.vocabularies"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5128,7 +5128,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5168,7 +5168,7 @@ in Zope catalog index for paths ''; homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5188,7 +5188,7 @@ in Subrequests for Zope2 ''; homepage = "http://pypi.python.org/pypi/plone.subrequest/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5208,7 +5208,7 @@ in An advanced form and widget framework for Zope 3 ''; homepage = "https://launchpad.net/z3c.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5228,7 +5228,7 @@ in Action icons product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5248,7 +5248,7 @@ in Helper to test WSGI applications ''; homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -5268,7 +5268,7 @@ in Manage link integrity in Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5288,7 +5288,7 @@ in The Original Zope 3 Form Framework ''; homepage = "http://pypi.python.org/pypi/zope.app.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5308,10 +5308,9 @@ in Local site manager implementation for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.localsitemanager"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; } - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2f3aca49cc5..ee29b74f72e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -474,7 +474,7 @@ rec { meta = { homepage = http://code.google.com/p/argparse/; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "argparse: Python command line parser"; @@ -577,7 +577,7 @@ rec { meta = { homepage = https://github.com/botocore/bcdoc; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "ReST document generation tools for botocore"; }; }; @@ -1582,7 +1582,7 @@ rec { homepage = http://code.google.com/p/cssutils/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; }); @@ -2785,7 +2785,7 @@ rec { meta = { homepage = http://freedesktop.org/wiki/Software/pyxdg; description = "Contains implementations of freedesktop.org standards"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -2801,7 +2801,7 @@ rec { meta = { homepage = https://github.com/erikrose/chardet; description = "Universal encoding detector"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -3288,7 +3288,7 @@ rec { ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ ]; }; @@ -4134,7 +4134,7 @@ rec { meta = { description = "Super-fast templating language."; homepage = http://www.makotemplates.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -4386,7 +4386,7 @@ rec { homepage = http://moinmo.in/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -4506,7 +4506,7 @@ rec { meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; }); @@ -4525,7 +4525,7 @@ rec { meta = { description = "Utilities for use with console mail clients, like mutt"; homepage = http://www.blacktrash.org/hg/muttils; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -5288,7 +5288,7 @@ rec { meta = { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc."; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' Pexpect is similar to the Don Libes "Expect" system, but Pexpect @@ -5715,7 +5715,7 @@ rec { description = "Python wrappers for the Crypto++ library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; @@ -6471,7 +6471,7 @@ rec { homepage = http://allmydata.org/trac/pyutil; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -6920,7 +6920,7 @@ rec { meta = { homepage = http://stuvel.eu/rsa; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "A pure-Python RSA implementation"; }; }; @@ -7108,7 +7108,7 @@ rec { homepage = http://code.google.com/p/simplejson/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }); @@ -7790,7 +7790,7 @@ rec { meta = { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; }; @@ -8075,7 +8075,7 @@ rec { meta = { homepage = "urlgrabber.baseurl.org"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = [ stdenv.lib.maintainers.qknight ]; }; @@ -8413,7 +8413,7 @@ rec { homepage = http://python-xlib.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8523,7 +8523,7 @@ rec { and Haskell API. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -9604,7 +9604,7 @@ rec { meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; From ad934ccc2234a3cb314ece42f693b4a708e7e3ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 11:42:49 +0200 Subject: [PATCH 009/286] singular: cosmetic fix for syntax highlighting --- pkgs/applications/science/math/singular/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index f4b3447e3b61..8a9f4e1d723a 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -38,7 +38,7 @@ rec { rm -rf "$out/LIB" cp -r Singular/LIB "$out" mkdir -p "$out/bin" - ln -s "$out"/*/Singular "$out/bin" + ln -s "$out/"*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; meta = { From d0ca8c237ec001ef176c82faf6b8104e83453ac9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 11:43:20 +0200 Subject: [PATCH 010/286] Fix broken license references. --- .../emacs-clang-complete-async/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 12 ++++++------ .../science/logic/iprover/default.nix | 11 ++++++----- .../science/logic/minisat/default.nix | 10 +++++----- .../science/logic/opensmt/default.nix | 10 +++++----- .../applications/science/math/gap/default.nix | 19 ++++++++++--------- .../science/math/singular/default.nix | 10 +++++----- .../science/misc/golly/default.nix | 13 +++++++------ pkgs/desktops/kde-4.12/applications/kate.nix | 2 +- .../kde-4.12/applications/konsole.nix | 2 +- .../kde-4.12/kde-baseapps/kde-baseapps.nix | 2 +- pkgs/desktops/kde-4.12/kde-workspace.nix | 4 ++-- .../kde-4.12/kdebindings/smokegen.nix | 2 +- .../desktops/kde-4.12/kdebindings/smokeqt.nix | 2 +- .../kde-4.12/kdegraphics/gwenview.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kamera.nix | 2 +- .../kde-4.12/kdegraphics/kcolorchooser.nix | 2 +- .../kdegraphics/kdegraphics-mobipocket.nix | 2 +- .../kdegraphics-strigi-analyzer.nix | 2 +- .../kdegraphics/kdegraphics-thumbnailers.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix | 2 +- .../kde-4.12/kdegraphics/kolourpaint.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kruler.nix | 2 +- .../kde-4.12/kdegraphics/ksaneplugin.nix | 2 +- .../kde-4.12/kdegraphics/ksnapshot.nix | 2 +- .../kde-4.12/kdegraphics/libkdcraw.nix | 2 +- .../kde-4.12/kdegraphics/libkexiv2.nix | 2 +- .../desktops/kde-4.12/kdegraphics/libkipi.nix | 2 +- .../kde-4.12/kdegraphics/libksane.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/okular.nix | 2 +- .../desktops/kde-4.12/kdegraphics/svgpart.nix | 2 +- .../kde-4.12/kdelibs/nepomuk-core.nix | 2 +- .../kde-4.12/kdelibs/nepomuk-widgets.nix | 2 +- .../libraries/haskell/hflags/default.nix | 2 +- .../tools/parsing/ragel/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 8 ++++---- .../os-specific/linux/radeontools/default.nix | 4 ++-- pkgs/tools/typesetting/lhs2tex/default.nix | 2 +- 38 files changed, 80 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9a84fbb77483..af031a6e1a16 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -20,6 +20,6 @@ clangStdenv.mkDerivation { meta = { homepage = "https://github.com/Golevka/emacs-clang-complete-async"; description = "An emacs plugin to complete C and C++ code using libclang"; - license = stdenv.lib.licenses.gpl3Plus; + license = clangStdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 88c189d9bbbe..8387b3486d4d 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,10 +1,10 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "3.6" a; + version = a.lib.attrByPath ["version"] "3.6" a; buildInputs = with a; [ - aalib gsl libpng libX11 xproto libXext xextproto + aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl ]; in @@ -24,11 +24,11 @@ rec { sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') mkdir -p $out/share/locale '') ["doUnpack" "minInit" "defEnsureDir"]; - + name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; description = "XaoS - fractal viewer"; - license = stdenv.lib.licenses.gpl2Plus; + license = a.stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index b1f48fdf04b9..e03b33fa43cc 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , ocaml, eprover , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,7 +38,7 @@ rec { echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover '') ["defEnsureDir" "minInit" "doMake"]; - + meta = { description = "An automated first-order logic theorem prover"; maintainers = with a.lib.maintainers; @@ -47,7 +47,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; + license = with a.lib.licenses; + gpl3; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index f8b4fc73100f..e91ff67fc9cc 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , zlib , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -36,7 +36,7 @@ rec { setVars = a.fullDepEntry ('' export MROOT=$PWD/../ '') ["doUnpack"]; - + meta = { description = "A compact and readable SAT-solver"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.mit; + license = a.stdenv.lib.licenses.mit; homepage = "http://minisat.se/"; }; passthru = { diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 065d1dd9e02c..2dc4b9934296 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , gmpxx, flex, bison , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -30,7 +30,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"]; - + meta = { description = "A satisfiability modulo theory (SMT) solver"; maintainers = with a.lib.maintainers; @@ -39,7 +39,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; + license = a.stdenv.lib.licenses.gpl3; homepage = "http://code.google.com/p/opensmt/"; }; passthru = { diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 49a46e0c8b27..74fff2390a39 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,10 +1,10 @@ x@{builderDefsPackage - , pari ? null + , pari ? null , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -44,14 +44,14 @@ rec { tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg" - ${if a.pari != null then - ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' + ${if a.pari != null then + ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' else ""} - sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" + sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" '' ["doMake" "minInit" "defEnsureDir"]; - + meta = { description = "Computational discrete algebra system"; maintainers = with a.lib.maintainers; @@ -60,7 +60,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + license = with a.lib.licenses; + gpl2; homepage = "http://gap-system.org/"; }; }) x diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8a9f4e1d723a..1afb510e9948 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , coreutils , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -40,7 +40,7 @@ rec { mkdir -p "$out/bin" ln -s "$out/"*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; - + meta = { description = "A CAS for polynomial computations"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 + license = a.stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; }; passthru = { diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index c0b7936edea7..9d198cd5c7f8 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,11 +1,11 @@ -x@{builderDefsPackage, +x@{builderDefsPackage, wxGTK, perl, python, zlib , ...}: builderDefsPackage -(a : -let +(a : +let s = import ./src-for-default.nix; - helperArgNames = ["builderDefsPackage"] ++ + helperArgNames = ["builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); @@ -26,7 +26,7 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" echo "Flags: $NIX_LDFLAGS" ''; - + meta = { description = "Cellular automata simulation program"; maintainers = with a.lib.maintainers; @@ -35,6 +35,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + license = with a.lib.licenses; + gpl2; }; }) x diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix index f5b74af1a8dd..e7a6476dd6df 100644 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ b/pkgs/desktops/kde-4.12/applications/kate.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: kde { diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix index 5fd745644468..bd4e9e58cd05 100644 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ b/pkgs/desktops/kde-4.12/applications/konsole.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kde_baseapps }: +{ stdenv, kde, kdelibs, kde_baseapps }: kde { diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix index 6d22fc425f5f..a65f33e13de1 100644 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, htmlTidy, kactivities +{ stdenv, kde, kdelibs, htmlTidy, kactivities , nepomuk_core, nepomuk_widgets, libXt }: kde { diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 9e4e8eaad051..537beaac6ae6 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors +{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors , pciutils, libraw1394, libusb1, python, libqalculate, akonadi , xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison , libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl @@ -15,7 +15,7 @@ kde { #todo: wayland, xmms, libusb isn't found buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg + [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp xorg.libxkbfile xorg.libXcomposite xorg.libXtst xorg.libXdamage diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix index 6646718ddc96..5708d0f96eb2 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake }: +{ stdenv, kde, qt4, cmake }: kde { buildInputs = [ qt4 ]; diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix index 06025a106185..494bc85e6465 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: +{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix index 6839a367aac6..3ce9b3dcc78a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core +{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core , libjpeg, pkgconfig, kactivities, lcms2 }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix index 58edc86b4291..d9aa11c54afa 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libgphoto2 }: +{ stdenv, kde, kdelibs, libgphoto2 }: kde { buildInputs = [ kdelibs libgphoto2 ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 3084d16faef2..e06c1b5d307c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix index 3a5dca63e0fd..e834762feb52 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, okular }: +{ stdenv, kde, kdelibs, okular }: kde { buildInputs = [ kdelibs okular ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix index 85a52c7d3d53..d9d35808ac50 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libtiff }: +{ stdenv, kde, kdelibs, libtiff }: kde { buildInputs = [ kdelibs libtiff ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix index 50bcc61bfbe3..d6207689512f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: +{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix index 419bdc67eeba..016312c199e5 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libXxf86vm }: +{ stdenv, kde, kdelibs, libXxf86vm }: kde { buildInputs = [ kdelibs libXxf86vm ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix index 6a999b9b3db2..ecf34e5ae9e5 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, qimageblitz }: +{ stdenv, kde, kdelibs, qimageblitz }: kde { buildInputs = [ kdelibs qimageblitz ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix index 3ce749dd7d8f..209331d9e83d 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix index 6ff2466f4b61..f541c4bdb4df 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libksane }: +{ stdenv, kde, kdelibs, libksane }: kde { buildInputs = [ kdelibs libksane ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix index 508ce2c10d18..a9897d270bb6 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libkipi }: +{ stdenv, kde, kdelibs, libkipi }: kde { buildInputs = [ kdelibs libkipi ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix index ede5e6ff1ada..1d5c6e2fcb4a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, pkgconfig, libraw, lcms2 }: +{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix index fca746e05f19..46ec45fad01a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, exiv2 }: +{ stdenv, kde, kdelibs, exiv2 }: kde { buildInputs = [ kdelibs exiv2 ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix index 6734ab015d75..65e6c52bd44f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix index 4d0bab676a26..6c3543eef370 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, saneBackends }: +{ stdenv, kde, kdelibs, saneBackends }: kde { buildInputs = [ kdelibs saneBackends ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix index 2b8d9231bfe8..092833388a78 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix @@ -1,4 +1,4 @@ -{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix index 984665b2f4be..2fc0e373dbdf 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix index 2d1a174eda52..d90e1455ce99 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 +{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 , pkgconfig, doxygen, ebook_tools }: diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix index febbaf61b4d5..b0fc5ad8900d 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, nepomuk_core }: +{ stdenv, kde, kdelibs, nepomuk_core }: kde { diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index 6584c1ff9070..d2ac39f139c5 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; - license = stdenv.lib.licenses.asl20; + license = self.stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 08980d5b1c4b..247daacf1617 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{composableDerivation, fetchurl, transfig, texLive}: +{stdenv, composableDerivation, fetchurl, transfig, texLive}: let version = "6.3"; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index f7734c320e64..44d07cf3ffd5 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage ,fetchsvn , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["fetchsvn"]; buildInputs = map (n: builtins.getAttr n x) @@ -54,7 +54,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + license = a.stdenv.lib.licenses.gpl2; }; passthru = { inherit srcDrv; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 3dd4588b0837..92e00ffad3fa 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation { cp radeontool lightwatch.pl $out/bin ''; - meta = { + meta = { description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; homepage = http://fdd.com/software/radeon/; - license = STDENV.LIB.LICENSES.ZLIB; + license = stdenv.lib.licenses.zlib; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 0dcd82535eeb..35e609b440ab 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = stdenv.lib.licenses.gpl2; + license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 4895ace12757d277f3f2c80289915ddff9bc9697 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 13:20:54 +0200 Subject: [PATCH 011/286] perl-packages.nix: partially revert 7a459962331e095c The commit referred to non-existent license "stdenv.lib.licenses.perl5". --- pkgs/top-level/perl-packages.nix | 750 +++++++++++++++---------------- 1 file changed, 375 insertions(+), 375 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2054483f72d1..1e8433cec7f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -61,7 +61,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -126,7 +126,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -151,7 +151,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; description = "Compile a log format string to perl-code"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -175,7 +175,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -268,7 +268,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -296,7 +296,7 @@ let self = _self // overrides; _self = with self; { ''; homepage = http://www.aarontrevena.co.uk/opensource/autodia/; - license = stdenv.lib.licenses.gpl2Plus; + license = "GPLv2+"; maintainers = [ ]; }; @@ -310,7 +310,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Replace functions with ones that succeed or die with lexical scope"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -325,7 +325,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/autovivification/; description = "Lexically disable autovivification"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -344,7 +344,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -357,7 +357,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -397,7 +397,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/boolean-pm/tree; description = "Boolean support for Perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -419,7 +419,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BusinessISBNData URI ]; meta = { description = "Parse and validate ISBNs"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -431,7 +431,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Data pack for Business::ISBN"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -444,7 +444,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -456,7 +456,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Work with International Standard Serial Numbers"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -552,7 +552,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Capture-Tiny; description = "Capture STDOUT and STDERR from Perl, XS or external programs"; - license = stdenv.lib.licenses.asl20; + license = "apache_2_0"; }; }; @@ -575,7 +575,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpAssert TestException ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -588,7 +588,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestException ]; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -611,7 +611,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ]; meta = { description = "Automated REST Method Dispatching"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -625,7 +625,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ]; meta = { description = "HTTP Basic and Digest authentication"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -651,7 +651,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -690,7 +690,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.linux; }; }; @@ -704,7 +704,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose TextSimpleTable ]; meta = { description = "Regex DispatchType"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -734,7 +734,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "The Catalyst developer's manual"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -748,7 +748,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystDevel CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassCursorCached DBIxClassSchemaLoader HashMerge ListMoreUtils Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes namespaceautoclean namespaceclean TieIxHash TryTiny ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.linux; }; }; @@ -764,7 +764,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.linux; }; }; @@ -778,7 +778,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; meta = { description = "Request logging from within Catalyst"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -792,7 +792,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -815,7 +815,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -829,7 +829,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; meta = { description = "Flexible caching support for Catalyst."; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -845,7 +845,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -882,7 +882,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; meta = { description = "Unicode aware Catalyst"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -907,7 +907,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -940,7 +940,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; meta = { description = "Display a stack trace on the debug screen"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -954,7 +954,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; meta = { description = "Make serving static pages painless"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -978,7 +978,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; meta = { description = "JSON view for your data"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -991,7 +991,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; meta = { description = "Template View Class"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1035,7 +1035,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = { description = "Replace the development server with Starman"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.linux; }; }; @@ -1088,7 +1088,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1099,7 +1099,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1119,7 +1119,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1135,7 +1135,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; meta = { description = "Lets you build groups of accessors"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1164,7 +1164,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmC3 ]; meta = { description = "A pragma to use the C3 method resolution order algortihm"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1179,7 +1179,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; description = "Make NEXT suck less"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1192,7 +1192,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1228,7 +1228,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Get information about a class and its structure"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1267,7 +1267,7 @@ let self = _self // overrides; _self = with self; { preConfigure = "patchShebangs ."; meta = { description = "A module for creating generic methods"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1281,7 +1281,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/sartak/Class-Method-Modifiers/tree; description = "Provides Moose-like method modifiers"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1323,7 +1323,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A working (require \"Class::Name\") and more"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1338,7 +1338,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "XS implementation of parts of Class::Load"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -1359,7 +1359,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1371,7 +1371,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively copy Perl datatypes"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1401,7 +1401,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Low-Level Interface to bzip2 compression library"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1438,7 +1438,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CaptureTiny ]; meta = { description = "A module to implement some of AutoConf macros in pure perl."; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1449,7 +1449,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1463,7 +1463,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1478,7 +1478,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/config-mvp; description = "Multivalue-property package-oriented configuration"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1492,7 +1492,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-MVP-Reader-INI; description = "An MVP config reader for .ini files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1583,7 +1583,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Read and write Changes files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1597,7 +1597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/cpan-meta; description = "The distribution metadata for a CPAN dist"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1612,7 +1612,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Verify requirements in a CPAN::Meta object"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1626,7 +1626,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/cpan-meta-requirements; description = "A set of version requirements for a CPAN dist"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1641,7 +1641,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/CPAN-Meta-YAML; description = "Read and write a subset of YAML for CPAN Meta files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1655,7 +1655,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/cpan-uploader; description = "Upload things to the CPAN"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1732,7 +1732,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1836,7 +1836,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1859,7 +1859,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Pretty printing of data structures"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1915,7 +1915,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rjbs/data-optlist; description = "Parse and validate simple name/value option pairs"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -1938,7 +1938,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/data-section; description = "Read multiple hunks of data out of your DATA section"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1950,7 +1950,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Modules that serialize data structures"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1965,7 +1965,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -1997,7 +1997,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; - license = stdenv.lib.licenses.asl20; + license = "apache_2_0"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2060,7 +2060,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; meta = { description = "A date and time object"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -2095,7 +2095,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -2108,7 +2108,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ]; meta = { description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2121,7 +2121,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2134,7 +2134,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format iCal datetime and duration strings"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2147,7 +2147,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2163,7 +2163,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2176,7 +2176,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2191,7 +2191,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format strp and strf time patterns"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -2205,7 +2205,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://datetime.perl.org/; description = "Localization support for DateTime.pm"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2232,7 +2232,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; meta = { description = "Time zone object base class and factory"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2246,7 +2246,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; meta = { description = "Parse a date/time string using the best method available"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2259,7 +2259,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding."; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2272,7 +2272,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -2295,7 +2295,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/timbunce/devel-sizeme; description = "Unknown"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2340,7 +2340,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -2356,7 +2356,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2369,7 +2369,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ]; meta = { description = "Sugar for your favorite ORM, DBIx::Class"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -2383,7 +2383,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan DBIxClass ]; meta = { description = "Cursor class with built-in caching support"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2405,7 +2405,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ]; meta = { description = "Simplify the common case stuff for DBIx::Class."; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -2418,7 +2418,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClass ]; meta = { description = "Introspect many-to-many relationships"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2432,7 +2432,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2447,7 +2447,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2490,7 +2490,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2506,7 +2506,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2519,7 +2519,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = http://search.cpan.org/dist/Devel-GlobalDestruction; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -2553,7 +2553,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An object representing a stack trace"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -2566,7 +2566,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "Displays stack trace in HTML"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2597,7 +2597,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2609,7 +2609,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2647,7 +2647,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Perl interface to the SHA-1 algorithm"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2662,7 +2662,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Declare version conflicts for your dist"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -2677,7 +2677,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; doCheck = false; }; @@ -2693,7 +2693,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2706,7 +2706,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2720,7 +2720,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; description = "Release tests for source encoding"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2734,7 +2734,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests; description = "Release tests making sure hard tabs aren't used"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2749,7 +2749,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; description = "Weave your Pod together from configuration and Dist::Zilla"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2764,7 +2764,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; description = "Automatically convert POD to a README in any format for Dist::Zilla"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2779,7 +2779,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2794,7 +2794,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2809,7 +2809,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; description = "Release tests for your META.json"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2824,7 +2824,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/; description = "Common tests to check syntax of your modules"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2839,7 +2839,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2854,7 +2854,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/; description = "Author tests making sure correct line endings are used"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -2869,7 +2869,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee; description = "Release tests for kwalitee"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2884,7 +2884,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2899,7 +2899,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/; description = "Tests to check your code against best practices"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2913,7 +2913,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; description = "Add release tests for POD links"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2928,7 +2928,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2943,7 +2943,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2958,7 +2958,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2973,7 +2973,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/; description = "Release Test::Version tests"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -2985,7 +2985,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailSimple MROCompat ]; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -2998,7 +2998,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "RFC 2822 Address Parsing"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -3010,7 +3010,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Produce RFC 8822 date strings"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3023,7 +3023,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3037,7 +3037,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3051,7 +3051,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Parse a MIME Content-Type Header"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3064,7 +3064,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fac34g44sn0l59wim68zrhih1mvlh1rxvyn3gc5pviaiz028lyy"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3089,7 +3089,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/email-sender; description = "A library for sending email"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -3102,7 +3102,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailDateFormat ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -3132,7 +3132,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "EucJP-ascii - An eucJP-open mapping"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3144,7 +3144,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Extra sets of Chinese encodings"; - license = stdenv.lib.licenses.mit; + license = "mit"; }; }; @@ -3197,7 +3197,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Safely and cleanly create closures via string eval"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -3262,7 +3262,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3275,7 +3275,7 @@ let self = _self // overrides; _self = with self; { sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3296,7 +3296,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A wrapper for perl's configuration"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3316,7 +3316,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3330,7 +3330,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Various portability utilities for module builders"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3343,7 +3343,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Build.PL install path logic made easy"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3355,7 +3355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A tool to build C libraries."; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3370,7 +3370,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; description = "Create a module Makefile"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3460,7 +3460,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3551,7 +3551,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { description = "Common rules for searching for Perl things"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3564,7 +3564,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; preCheck = "export HOME=$TMPDIR"; }; @@ -3649,7 +3649,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3664,7 +3664,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3676,7 +3676,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Install shared files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3690,7 +3690,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and dumb file system watcher"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3704,7 +3704,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3756,7 +3756,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3803,7 +3803,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ GD ]; meta = { description = "Security image (captcha) generator"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -3835,7 +3835,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -3863,7 +3863,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ]; meta = { description = "Simple interface to Google Protocol Buffers"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3947,7 +3947,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -3959,7 +3959,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Store multiple values per key"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4026,7 +4026,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; meta = { description = "Class that represents an HTML form element"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4062,7 +4062,7 @@ let self = _self // overrides; _self = with self; { description = "HTML forms using Moose"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4075,7 +4075,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTagset ]; meta = { description = "HTML parser class"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4155,7 +4155,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Work with HTML in a DOM-like tree structure"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -4168,7 +4168,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; meta = { description = "Add XPath support to HTML::TreeBuilder"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4197,7 +4197,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4210,7 +4210,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage ]; meta = { description = "HTTP cookie jars"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4223,7 +4223,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; meta = { description = "A simple http server class"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4235,7 +4235,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Date conversion routines"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4264,7 +4264,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style messages"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4277,7 +4277,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Choose a variant to serve"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4319,7 +4319,7 @@ let self = _self // overrides; _self = with self; { }; doCheck = false; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4351,7 +4351,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4375,7 +4375,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; doCheck = !stdenv.isDarwin; }; @@ -4398,7 +4398,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Open an HTML file with automatic charset detection"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -4410,7 +4410,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Utilities for interactive I/O"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4450,7 +4450,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/noxxi/p5-io-socket-ssl; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; doCheck = false; # tries to connect to facebook.com etc. }; @@ -4482,7 +4482,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4506,7 +4506,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -4577,7 +4577,7 @@ let self = _self // overrides; _self = with self; { for immediate access from Perl. ''; - license = stdenv.lib.licenses.perl5; + license = "Artistic"; maintainers = [ ]; }; @@ -4609,7 +4609,7 @@ let self = _self // overrides; _self = with self; { available to the Perl program as if they had been written in Perl. ''; - license = stdenv.lib.licenses.perl5; + license = "Artistic"; maintainers = [ ]; }; @@ -4632,7 +4632,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4645,7 +4645,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4657,7 +4657,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "JSON::XS compatible pure-Perl module"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4669,7 +4669,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Helper module in using JSON::PP in Perl 5.6"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4779,7 +4779,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4801,7 +4801,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Provide the stuff missing in List::Util"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4884,7 +4884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { description = "Simple logging interface with a contextual log"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4899,7 +4899,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ParamsValidate ]; meta = { description = "Dispatches messages to one or more outputs"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4932,7 +4932,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatch-array; description = "Log events to an array (reference)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4947,7 +4947,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatchouli; description = "A simple wrapper around Log::Dispatch"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4961,7 +4961,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to start a daemon meta = { description = "The World-Wide Web library for Perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4973,7 +4973,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Guess media type for a file or a URL"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -4990,7 +4990,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5003,7 +5003,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = { description = "The World-Wide Web library for Perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5184,7 +5184,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5207,7 +5207,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FennecLite TestException ]; meta = { description = "Tools for creating Meta objects to track custom metrics"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5222,7 +5222,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelDeclare ]; meta = { description = "Basic method declarations with signatures, without source filters"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5261,7 +5261,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Charset Information for MIME"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5282,7 +5282,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Definition of MIME types"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5296,7 +5296,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5310,7 +5310,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/Modern-Perl; description = "Enable all of the features of Modern Perl with one import"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5323,7 +5323,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5337,7 +5337,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ]; meta = { description = "A tiny replacement for Module::Build"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5359,7 +5359,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.perl.org/; description = "What modules shipped with versions of perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5371,7 +5371,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Find and use installed modules in a (sub)category"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5386,7 +5386,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Loads one of several alternate underlying implementations for a module"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -5399,7 +5399,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5413,7 +5413,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5426,7 +5426,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Declare author-only dependencies"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5441,7 +5441,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Designate tests only run by module authors"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5457,7 +5457,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil ]; meta = { description = "Parse and examine a Perl distribution MANIFEST file"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5479,7 +5479,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DevelFindPerl ]; meta = { description = "Get the full path to a locally installed module"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5495,7 +5495,7 @@ let self = _self // overrides; _self = with self; { ]; meta = { description = "Automatically give your module the ability to have plugins"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5517,7 +5517,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5529,7 +5529,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively scan Perl code for dependencies"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5542,7 +5542,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5568,7 +5568,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://mojolicio.us; description = "Real-time web framework"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -5582,7 +5582,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ]; meta = { description = "Minimalist Object Orientation (with Moose compatiblity)"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5597,7 +5597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A postmodern object system for Perl 5"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5611,7 +5611,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5626,7 +5626,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5653,7 +5653,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5678,7 +5678,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5707,7 +5707,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ]; meta = { description = "An abstract Moose role for setting attributes from a configfile"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5723,7 +5723,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; meta = { description = "Role for daemonizing your Moose based application"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5737,7 +5737,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceclean ]; meta = { description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5752,7 +5752,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Getopt; description = "A Moose role for processing command line options"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5767,7 +5767,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5784,7 +5784,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/MooseX-Has-Sugar; description = "Sugar Syntax for moose 'has' fields"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5799,7 +5799,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; description = "Required attributes which fail only when trying to use them"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5814,7 +5814,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; - license = stdenv.lib.licenses.lgpl21; + license = "lgpl_2_1"; }; }; @@ -5829,7 +5829,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5843,7 +5843,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils Moose ]; meta = { description = "Easy subclassing of non-Moose classes"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5858,7 +5858,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/moosex-oneargnew; description = "Teach ->new to accept single, non-hashref arguments"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5882,7 +5882,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; meta = { description = "An extension of Params::Validate using Moose's types"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5897,7 +5897,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -5912,7 +5912,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -5972,7 +5972,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -6008,7 +6008,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Organise your Moose types in libraries"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -6049,7 +6049,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; meta = { description = "Extensions to MooseX::Types::DateTime"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6075,7 +6075,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6105,7 +6105,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; meta = { description = "Moose types that check against Perl syntax"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6137,7 +6137,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6186,7 +6186,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6225,7 +6225,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/namespace-autoclean; description = "Keep imports out of your namespace"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -6239,7 +6239,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/namespace-clean; description = "Keep imports and functions out of your namespace"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -6312,7 +6312,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6325,7 +6325,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6341,7 +6341,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ]; meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6365,7 +6365,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6398,7 +6398,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Low-level HTTP connection (client)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6432,7 +6432,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; meta = { description = "An implementation of the OAuth protocol"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6446,7 +6446,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ]; meta = { description = "An Asynchronous and multi channel Perl AMQP client"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6527,7 +6527,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/semifor/Net-Twitter-Lite; description = "A perl interface to the Twitter API"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6556,7 +6556,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Comprehensive inside-out object support module"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6607,7 +6607,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Manage deprecation warnings for your distribution"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -6622,7 +6622,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -6636,7 +6636,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -6658,7 +6658,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Simple, compact and correct param-checking functions"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -6673,7 +6673,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Validate method/function parameters"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -6706,7 +6706,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; description = "Parse META.yml and META.json CPAN metadata files"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6726,7 +6726,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cross-platform path specification manipulation"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6774,7 +6774,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6855,7 +6855,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6869,7 +6869,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir ModuleVersions Plack TextMicroTemplate ]; meta = { description = "Display information about the current request/response"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6884,7 +6884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack ]; meta = { description = "Supports app to run as a reverse proxy backend"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6897,7 +6897,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage LWPUserAgent Plack TestTCP URI ]; meta = { description = "Run HTTP tests on external live servers"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6911,7 +6911,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; meta = { description = "Parse, Analyze and Manipulate Perl (without perl)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; doCheck = false; }; @@ -6925,7 +6925,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; meta = { description = "Parse regular expressions"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6939,7 +6939,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; meta = { description = "Extensions to L"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -6988,7 +6988,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ]; meta = { description = "Find a minimum required version of perl for Perl code"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7003,7 +7003,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/perl-prereqscanner; description = "A tool to scan your Perl code for its prerequisites"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7016,7 +7016,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp ]; meta = { description = "Parse and manipulate Perl version strings"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7039,7 +7039,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-coverage-trustpod; description = "Allow a module's pod to contain Pod::Coverage hints"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7054,7 +7054,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental; description = "Work with nestable Pod elements"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7069,7 +7069,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental-perlmunger; description = "A thing that takes a string of Perl and rewrites its documentation"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7090,7 +7090,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MixinLinewise TestDeep ]; meta = { description = "Read a POD document as a series of trivial events"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7118,7 +7118,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rwstauner/Pod-Markdown; description = "Convert POD to Markdown"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7150,7 +7150,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-weaver; description = "Weave together a Pod document from an outline"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7189,7 +7189,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Redis/; description = "Perl binding for Redis database"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7242,7 +7242,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7276,7 +7276,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ]; meta = { description = "A thing with a message method"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7290,7 +7290,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7303,7 +7303,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal ]; meta = { description = "Roles, like a nouvelle cuisine portion size slice of Moose"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7329,7 +7329,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Call isa, can, does and DOES safely on things that may not be objects"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7349,7 +7349,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Lexically-scoped resource management"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7362,7 +7362,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Scope-Upper/; description = "Act on upper scopes"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7392,7 +7392,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7415,7 +7415,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7440,7 +7440,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/software-license; description = "Packages that provide templated software licenses"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7481,7 +7481,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; meta = { description = "Generate SQL from Perl data structures"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7540,7 +7540,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/miyagawa/Starman; description = "High-performance preforking PSGI/Plack web server"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7567,7 +7567,7 @@ let self = _self // overrides; _self = with self; { meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7597,7 +7597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://plackperl.org; description = "Temporary buffer to save bytes"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7610,7 +7610,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; description = "Turn on strict and make all warnings fatal"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7644,7 +7644,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; meta = { description = "A simple sprintf-like dialect"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7670,7 +7670,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/string-flogger; description = "String munging for loggers"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7713,7 +7713,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Rewrite strings based on a set of known prefixes"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7748,7 +7748,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { description = "A module for when strings are too long to be displayed in.."; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7762,7 +7762,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7776,7 +7776,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "String::Util -- String processing utilities"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7790,7 +7790,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7803,7 +7803,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubName ]; meta = { description = "Helper routines for using Sub::Exporter to build methods"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7817,7 +7817,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter-globexporter; description = "Export shared globs with Sub::Exporter collectors"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7830,7 +7830,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Only use Sub::Exporter if you need it"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7844,7 +7844,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7865,7 +7865,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Install subroutines into packages easily"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7898,7 +7898,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/sub-uplevel; description = "Apparently run a function in a higher stack frame"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -7971,7 +7971,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/phaylon/syntax/wiki; description = "Activate syntax extensions"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -7984,7 +7984,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ]; meta = { description = "Perl6 style Junction operators in Perl5"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8006,7 +8006,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; description = "Stream TAP from pgTAP test scripts"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ ocharles ]; }; @@ -8052,7 +8052,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ensure that a platform has weaken support"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8079,7 +8079,7 @@ let self = _self // overrides; _self = with self; { meta = { maintainers = with maintainers; [ eelco ]; description = "Perl Template Toolkit Plugin for IO::All"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8131,7 +8131,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -8143,7 +8143,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Detect encoding of the current terminal"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8157,7 +8157,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8170,7 +8170,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; meta = { description = ""; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8279,7 +8279,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8291,7 +8291,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Validate your CPAN META.yml files"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -8316,7 +8316,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TextDiff ]; meta = { description = "Test strings and data structures and show differences if not ok"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8331,7 +8331,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-DistManifest; description = "Author test that validates a package MANIFEST"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8344,7 +8344,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8385,7 +8385,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/test-fatal; description = "Incredibly simple helpers for testing code with exceptions"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -8400,7 +8400,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8495,7 +8495,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A postmodern object system for Perl 5"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -8516,7 +8516,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Test-Mojibake; description = "Check your source for encoding misbehavior"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8531,7 +8531,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; meta = { description = "Most commonly needed test functions and features"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8543,7 +8543,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check the presence of tabs in your project"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8599,7 +8599,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod/; description = "Check for POD errors in files"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -8623,7 +8623,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/; description = "Tests POD for invalid links"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8635,7 +8635,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check file names portability"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8647,7 +8647,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Checks to see if the module can be loaded"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8662,7 +8662,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8704,7 +8704,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test your SYNOPSIS code"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8716,7 +8716,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Write tests, not scripts that run them"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8731,7 +8731,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8751,7 +8751,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unit testing without external dependencies"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8780,7 +8780,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Perl extension to test methods for warnings"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -8794,7 +8794,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8806,7 +8806,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test fallback behaviour in absence of modules"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8822,7 +8822,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/petdance/test-www-mechanize; description = "Testing-specific WWW::Mechanize subclass"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -8836,7 +8836,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8862,7 +8862,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8899,7 +8899,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interface to read and parse BibTeX files"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -8920,7 +8920,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmDiff ]; meta = { description = "Perform diffs on files and record sets"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8940,7 +8940,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Framework for more readable interactive test scripts"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8963,7 +8963,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ]; meta = { description = "Spy on objects to achieve test doubles (mock testing)"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8979,7 +8979,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ]; meta = { description = "Does your code require newer perl than you think?"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -8991,7 +8991,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Micro template engine with Perl5 language"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9029,7 +9029,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple eyecandy ASCII tables"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -9079,7 +9079,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc."; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9092,7 +9092,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/gfx/p5-Test-Vars; description = "Detects unused variables"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9107,7 +9107,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Version/; description = "Check to see that version's in modules are sane"; - license = stdenv.lib.licenses.artistic2; + license = "artistic_2"; }; }; @@ -9119,7 +9119,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Remove leading and/or trailing whitespace from strings"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9175,7 +9175,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cycle through a list of values via a scalar"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9187,7 +9187,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered associative arrays for Perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9199,7 +9199,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered hashes for Perl"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9229,7 +9229,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9243,7 +9243,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExporterLite ]; meta = { description = "Parse string that represents time duration"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9265,7 +9265,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An N-ary tree"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -9278,7 +9278,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; meta = { description = "A simple tree object"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9320,7 +9320,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/UNIVERSAL-isa; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9332,7 +9332,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Require() modules from a variable"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9355,7 +9355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unicode Collation Algorithm"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9367,7 +9367,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Wrapper around ICU collation services"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9383,7 +9383,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MIMECharset ]; meta = { description = "UAX #14 Unicode Line Breaking Algorithm"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9403,7 +9403,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9417,7 +9417,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/URI-Find; description = "Find URIs in arbitrary text"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -9430,7 +9430,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsValidate URI ]; meta = { description = "Build a URI from a set of named parameters"; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9453,7 +9453,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9522,7 +9522,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/bestpractical/www-mechanize; description = "Handy web browsing in a Perl object"; - license = stdenv.lib.licenses.perl5; + license = "perl5"; }; }; @@ -9552,7 +9552,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; meta = { description = "Database of robots.txt-derived permissions"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9619,7 +9619,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9738,7 +9738,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/yaml-pm/tree; description = "YAML Ain't Markup Language (tm)"; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; }; @@ -9751,7 +9751,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/YAML-Syck; description = "Fast, lightweight YAML loader and dumper"; - license = stdenv.lib.licenses.mit; + license = "mit"; }; }; From 911eb8d934a31f60a6d58aca9fcf44719f92b30e Mon Sep 17 00:00:00 2001 From: Andrew Morsillo Date: Mon, 28 Jul 2014 09:01:45 -0400 Subject: [PATCH 012/286] bump version to 0.40.05 --- pkgs/games/dwarf-fortress/df2014.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix index aecdb0a44e13..6a0d30ea89f4 100644 --- a/pkgs/games/dwarf-fortress/df2014.nix +++ b/pkgs/games/dwarf-fortress/df2014.nix @@ -4,11 +4,11 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "dwarf-fortress-0.40.04"; + name = "dwarf-fortress-0.40.05"; src = fetchurl { - url = "http://www.bay12games.com/dwarves/df_40_04_linux.tar.bz2"; - sha256 = "0kzkq42mpih5lsv8bv98j8ls26a8sbb1amp8bnf04k63ai99b9zx"; + url = "http://www.bay12games.com/dwarves/df_40_05_linux.tar.bz2"; + sha256 = "1b9nd33yz5a945v9jyqii1k4s71i701m2d0h7fw6f5g9p6nvx43s"; }; phases = "unpackPhase patchPhase installPhase"; From 760d5796520d5713e753d1212d01b4ea9e5fdb39 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 28 Jul 2014 16:46:48 +0300 Subject: [PATCH 013/286] quassel: fix wrapper for all flag values --- .../applications/networking/irc/quassel/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 432dbddb97c0..ba3d7b8c368a 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -40,10 +40,15 @@ in with stdenv; mkDerivation rec { ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; - preFixup = '' - wrapProgram "$out/bin/quasselclient" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - ''; + preFixup = + lib.optionalString client '' + wrapProgram "$out/bin/quasselclient" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + '' + + lib.optionalString monolithic '' + wrapProgram "$out/bin/quassel" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + ''; meta = with stdenv.lib; { homepage = http://quassel-irc.org/; From 4a108847afb177305edb8375dbd3908c99369599 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Jul 2014 05:05:01 +0200 Subject: [PATCH 014/286] chromium: Update all channels to latest versions. With this commit, the following new upstream versions are introduced: stable: 35.0.1916.153 -> 36.0.1985.125 beta: 36.0.1985.84 -> 37.0.2062.44 dev: 37.0.2054.3 -> 38.0.2101.0 All builds were successfully tested on my machine, however in order to update the beta and dev channels, a few additional modifications were necessary: * Don't update address_input_strings.grdp anymore because this has been done/fixed upstream and was relevant in version 37.0.2054.3 _only_. * No need to fix references to /usr/bin/gcc in version 38 anymore. * Constrain patch for Angle (introduced in 4cbedd7) to version 37 only, because it already has been applied upstream in version 38. * Drop user namespaces patch for version 31 up until version 35, because version 36 is already in stable. * Don't try to build bundled Clang and/or even build using Clang. * Remove obsolete patchPhase commands that are specific to version 35 and older. While testing the dev version 38 I came accross a font rendering issue which needs to be addressed ASAP (perhaps related to #3187), however the browser works otherwise. Signed-off-by: aszlig --- .../networking/browsers/chromium/common.nix | 15 +- .../browsers/chromium/source/default.nix | 9 +- .../chromium/source/sandbox_userns_31.patch | 297 ------------------ .../browsers/chromium/source/sources.nix | 24 +- 4 files changed, 21 insertions(+), 324 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3aac5f9b17ae..311257952712 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -79,7 +79,7 @@ let }; opusWithCustomModes = libopus.override { - withCustomModes = !versionOlder source.version "35.0.0.0"; + withCustomModes = true; }; defaultDependencies = [ @@ -132,19 +132,13 @@ let find -iname '*.gyp*' \( -type f -o -type l \) \ -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ -exec chmod u+w {} + - '' + optionalString (!versionOlder source.version "37.0.0.0") '' - python third_party/libaddressinput/chromium/tools/update-strings.py ''; - postPatch = let - toPatch = if versionOlder source.version "36.0.0.0" - then "content/browser/browser_main_loop.cc" - else "sandbox/linux/suid/client/setuid_sandbox_client.cc"; - in '' + postPatch = '' sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); - ' ${toPatch} - '' + optionalString (!versionOlder source.version "36.0.0.0") '' + ' sandbox/linux/suid/client/setuid_sandbox_client.cc + sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc @@ -165,6 +159,7 @@ let use_cups = cupsSupport; linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + clang = false; # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. use_mojo = versionOlder source.version "37.0.0.0"; diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 6a6b299ee511..70b01d071a78 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = if (versionOlder version "36.0.0.0") - then singleton ./sandbox_userns_31.patch - else singleton ./sandbox_userns_36.patch; + patches = singleton ./sandbox_userns_36.patch; postPatch = '' sed -i -r \ @@ -32,14 +30,15 @@ stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi + '' + optionalString (versionOlder version "38.0.0.0") ('' sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/preprocessor.pm - '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d third_party/openssl/openssl '' + optionalString (!versionOlder version "37.0.0.0") '' patch -p1 -d third_party/angle < "${./angle_build_37.patch}" + '') + optionalString useOpenSSL '' + cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; outputs = [ "out" "sandbox" "bundled" "main" ]; diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch deleted file mode 100644 index 490c1a9cebe9..000000000000 --- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch +++ /dev/null @@ -1,297 +0,0 @@ -commit ff4e8b4af04c58fc4c58ee7ed108aefcdc26a960 -Author: aszlig -Date: Thu May 16 14:17:56 2013 +0200 - - zygote: Add support for user namespaces on Linux. - - The implementation is done by patching the Zygote host to execute the sandbox - binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child - process is using uid 0 and gid 0 which map to the current user of the parent. - Afterwards, the sandbox will continue as if it was called as a setuid binary. - - In addition, this adds new_user_namespace as an option in process_util in order - to set the UID and GID mapping correctly. The reason for this is that just - passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because - without setting the mappings exec*() will clear the process's capability sets. - - If the kernel doesn't support unprivileged user namespaces and the sandbox - binary doesn't have the setuid flag, the Zygote main process will run without a - sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. - - Signed-off-by: aszlig - -diff --git a/base/process/launch.cc b/base/process/launch.cc -index 1329a5a..ec28fdf 100644 ---- a/base/process/launch.cc -+++ b/base/process/launch.cc -@@ -24,6 +24,7 @@ LaunchOptions::LaunchOptions() - new_process_group(false) - #if defined(OS_LINUX) - , clone_flags(0) -+ , new_user_namespace(false) - #endif // OS_LINUX - #if defined(OS_CHROMEOS) - , ctrl_terminal_fd(-1) -diff --git a/base/process/launch.h b/base/process/launch.h -index ac2df5e..34a3851 100644 ---- a/base/process/launch.h -+++ b/base/process/launch.h -@@ -100,6 +100,9 @@ struct BASE_EXPORT LaunchOptions { - #if defined(OS_LINUX) - // If non-zero, start the process using clone(), using flags as provided. - int clone_flags; -+ -+ // If true, start the process in a new user namespace. -+ bool new_user_namespace; - #endif // defined(OS_LINUX) - - #if defined(OS_CHROMEOS) -diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc -index de6286d..9333494 100644 ---- a/base/process/launch_posix.cc -+++ b/base/process/launch_posix.cc -@@ -37,6 +37,13 @@ - #include "base/threading/platform_thread.h" - #include "base/threading/thread_restrictions.h" - -+#if defined(OS_LINUX) -+#include -+#if !defined(CLONE_NEWUSER) -+#define CLONE_NEWUSER 0x10000000 -+#endif -+#endif -+ - #if defined(OS_CHROMEOS) - #include - #endif -@@ -294,13 +301,23 @@ bool LaunchProcess(const std::vector& argv, - - pid_t pid; - #if defined(OS_LINUX) -- if (options.clone_flags) { -+ int map_pipe_fd[2]; -+ int flags = options.clone_flags; -+ -+ if (options.new_user_namespace) { -+ flags |= CLONE_NEWUSER; -+ if (pipe(map_pipe_fd) < 0) { -+ DPLOG(ERROR) << "user namespace pipe"; -+ return false; -+ } -+ } -+ -+ if (options.clone_flags || options.new_user_namespace) { - // Signal handling in this function assumes the creation of a new - // process, so we check that a thread is not being created by mistake - // and that signal handling follows the process-creation rules. -- RAW_CHECK( -- !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); -+ RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -+ pid = syscall(__NR_clone, flags, 0, 0, 0); - } else - #endif - { -@@ -318,6 +335,21 @@ bool LaunchProcess(const std::vector& argv, - } else if (pid == 0) { - // Child process - -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // Close the write end of the pipe so we get an EOF when the parent closes -+ // the FD. This is to avoid race conditions when the UID/GID mappings are -+ // written _after_ execvp(). -+ close(map_pipe_fd[1]); -+ -+ char dummy; -+ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { -+ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); -+ _exit(127); -+ } -+ } -+#endif -+ - // DANGER: fork() rule: in the child, if you don't end up doing exec*(), - // you call _exit() instead of exit(). This is because _exit() does not - // call any previously-registered (in the parent) exit handlers, which -@@ -433,6 +465,40 @@ bool LaunchProcess(const std::vector& argv, - _exit(127); - } else { - // Parent process -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // We need to write UID/GID mapping here to map the current user outside -+ // the namespace to the root user inside the namespace in order to -+ // correctly "fool" the child process. -+ char buf[256]; -+ int map_fd, map_len; -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to uid_map."); -+ } -+ close(map_fd); -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to gid_map."); -+ } -+ close(map_fd); -+ -+ // Close the pipe on the parent, so the child can continue doing the -+ // execvp() call. -+ close(map_pipe_fd[1]); -+ } -+#endif -+ - if (options.wait) { - // While this isn't strictly disk IO, waiting for another process to - // finish is the sort of thing ThreadRestrictions is trying to prevent. -diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index fea43b5..95cbe07 100644 ---- a/content/browser/zygote_host/zygote_host_impl_linux.cc -+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -121,25 +121,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - - sandbox_binary_ = sandbox_cmd.c_str(); - -- // A non empty sandbox_cmd means we want a SUID sandbox. -- using_suid_sandbox_ = !sandbox_cmd.empty(); -+ bool userns_sandbox = false; -+ const std::vector cmd_line_unwrapped(cmd_line.argv()); - -- if (using_suid_sandbox_) { -+ if (!sandbox_cmd.empty()) { - struct stat st; - if (stat(sandbox_binary_.c_str(), &st) != 0) { - LOG(FATAL) << "The SUID sandbox helper binary is missing: " - << sandbox_binary_ << " Aborting now."; - } - -- if (access(sandbox_binary_.c_str(), X_OK) == 0 && -- (st.st_uid == 0) && -- (st.st_mode & S_ISUID) && -- (st.st_mode & S_IXOTH)) { -+ if (access(sandbox_binary_.c_str(), X_OK) == 0) { -+ using_suid_sandbox_ = true; -+ - cmd_line.PrependWrapper(sandbox_binary_); - - scoped_ptr - sandbox_client(sandbox::SetuidSandboxClient::Create()); - sandbox_client->SetupLaunchEnvironment(); -+ -+ if (!((st.st_uid == 0) && -+ (st.st_mode & S_ISUID) && -+ (st.st_mode & S_IXOTH))) { -+ userns_sandbox = true; -+ sandbox_client->SetNoSuid(); -+ } - } else { - LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " - "configured correctly. Rather than run without sandboxing " -@@ -163,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - base::ProcessHandle process = -1; - base::LaunchOptions options; - options.fds_to_remap = &fds_to_map; -+ if (userns_sandbox) -+ options.new_user_namespace = true; - base::LaunchProcess(cmd_line.argv(), options, &process); -+ -+ if (process == -1 && userns_sandbox) { -+ LOG(ERROR) << "User namespace sandbox failed to start, running without " -+ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " -+ << "enabled in order to use the sandbox without setuid bit."; -+ using_suid_sandbox_ = false; -+ options.new_user_namespace = false; -+ base::LaunchProcess(cmd_line_unwrapped, options, &process); -+ } -+ - CHECK(process != -1) << "Failed to launch zygote process"; - - if (using_suid_sandbox_) { -diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc -index 567b305..1089233 100644 ---- a/content/zygote/zygote_main_linux.cc -+++ b/content/zygote/zygote_main_linux.cc -@@ -426,6 +426,13 @@ static bool EnterSuidSandbox(LinuxSandbox* linux_sandbox, - *has_started_new_init = true; - } - -+ // Don't set non-dumpable, as it causes trouble when the host tries to find -+ // the zygote process (XXX: Not quite sure why this happens with user -+ // namespaces). Fortunately, we also have the seccomp filter sandbox which -+ // should disallow the use of ptrace. -+ if (setuid_sandbox->IsNoSuid()) -+ return true; -+ - #if !defined(OS_OPENBSD) - // Previously, we required that the binary be non-readable. This causes the - // kernel to mark the process as non-dumpable at startup. The thinking was -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc -index 34231d4..36e3201 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.cc -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc -@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { - return env_->HasVar(kSandboxNETNSEnvironmentVarName); - } - -+bool SetuidSandboxClient::IsNoSuid() const { -+ return env_->HasVar(kSandboxNoSuidVarName); -+} -+ - bool SetuidSandboxClient::IsSandboxed() const { - return sandboxed_; - } -@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { - SetSandboxAPIEnvironmentVariable(env_); - } - -+void SetuidSandboxClient::SetNoSuid() { -+ env_->SetVar(kSandboxNoSuidVarName, "1"); -+} -+ - } // namespace sandbox - -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h -index a9f6536..2e8113a 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.h -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h -@@ -39,6 +39,8 @@ class SetuidSandboxClient { - bool IsInNewPIDNamespace() const; - // Did the setuid helper create a new network namespace ? - bool IsInNewNETNamespace() const; -+ // Is sandboxed without SUID binary ? -+ bool IsNoSuid() const; - // Are we done and fully sandboxed ? - bool IsSandboxed() const; - -@@ -46,6 +48,8 @@ class SetuidSandboxClient { - // helper. - void SetupLaunchEnvironment(); - -+ void SetNoSuid(); -+ - private: - // Holds the environment. Will never be NULL. - base::Environment* env_; -diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h -index aad4ff8..bd710d5 100644 ---- a/sandbox/linux/suid/common/sandbox.h -+++ b/sandbox/linux/suid/common/sandbox.h -@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; - - static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; - static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; -+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; - - static const long kSUIDSandboxApiNumber = 1; - static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 965328d43a4a..294577aa5594 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "37.0.2054.3"; - sha256 = "1sly1fb9wh10m36crikahn7wgsq7j090jaga4l8zk4kihzprcnj2"; - sha256bin32 = "0242ypzgzskkmsw3iyirxzlm1gbng94lv723ffcr018grq9yg4gs"; - sha256bin64 = "17kzb7k0vn96wa6a4xfx05885li1qjg8bp6y3ngs2i0wws9ypfd9"; + version = "38.0.2101.0"; + sha256 = "01lmnw6kf7qahifybpcf7275ilbsdz1mg10lckh9jhbqk4mxy4c4"; + sha256bin32 = "06grj03bvkgfmr5gfhv5gqn9vrz0r37svp5wr0l7d2iav7vk7g9g"; + sha256bin64 = "0d856xkjpx1pcwrkfqa40kwy3s1nvc2qksvrvvdfb84fg3gc4j42"; }; beta = { - version = "36.0.1985.84"; - sha256 = "02hhqx5m4hxmnf8l3a2ah9k39bpz35sll6gv89vz27vdgb6mza0j"; - sha256bin32 = "1jjxzknyiw6d5p0bcb7c9d0siffg55wmm34lq1phz1jlqq6hz6zy"; - sha256bin64 = "1jr9a386arfmd8rskns9bmlczzr3xzcw9ykv7xf23iz86qqp723r"; + version = "37.0.2062.44"; + sha256 = "0pvwdrwygn236bg8wdambwkw9iglq0a3lm8sr7k3q02ng5v0l111"; + sha256bin32 = "1j326kgng245b1lf5dlg0ipwbrm7miiz5byhisqls30v1q3njka9"; + sha256bin64 = "1w86salg04z42c518v6nn40003zhabk33plrz5zh9nfjdxn6nxig"; }; stable = { - version = "35.0.1916.153"; - sha256 = "03p7wmlvbrgd8m94344z4azkhrffwrr5c76dm8c4jcxs0x1yn318"; - sha256bin32 = "0xm34xwdai8ns6bkq5dshh4izls70rwgvya23md4vxq6iv78sykn"; - sha256bin64 = "1x2cm1i8v8d69856b42anms33clv63adzpqy58in6i9vba13swif"; + version = "36.0.1985.125"; + sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp"; + sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03"; + sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc"; }; } From 39c09b04c79974b85c4cc471e85bf4ef1afc382b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Jul 2014 15:18:24 +0200 Subject: [PATCH 015/286] ATS2 version [0.0.7] --> [0.1.0] --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 1f6a8b6c6e08..8c71138ab78e 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.0.7"; + version = "0.1.0"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1cv7caaf9fj6z3kln02ikkbmcy42324v39lzx3cf6qcsywwpm8fx"; + sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4"; }; buildInputs = [ gmp ]; From 36f99a9a826a9b113aab8eb4e5ad267e4d87b84e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jul 2014 19:06:09 +0200 Subject: [PATCH 016/286] Set $SSL_CERT_FILE It's more standard than $OPENSSL_X509_CERT_FILE (which I guess was a totally unnecessary patch to OpenSSL). Since curl respects $SSL_CERT_FILE, it's no longer needed to set $CURL_CA_BUNDLE. Git unfortunately doesn't. --- nixos/modules/security/ca.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index dd4b0c529e5d..8e653cd42847 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -13,8 +13,9 @@ with lib; ]; environment.sessionVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + { SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + # FIXME: unneeded - remove eventually. + OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; From f5905b5fd3731bf6842065adecf88622db93734e Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 28 Jul 2014 19:49:10 +0200 Subject: [PATCH 017/286] mopdiy: Update from 0.18.3 to 0.19.0 --- pkgs/applications/audio/mopidy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 65487bac8232..10c7c1751ff8 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,15 +5,15 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.18.3"; + version = "0.19.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0b8ss6qjzj1pawd8469i5310ily3rad0ashfy87vdyj6xdyfyp0q"; + sha256 = "10cnc1bipr0brk7478201cgm71lp5bci3qiaadyxv9hhcn0nmn9b"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka cherrypy ws4py gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good ]; # There are no tests From 5b3f2e9a5eec38bac4f38389807b10a1c9b5593d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 28 Jul 2014 19:49:41 +0200 Subject: [PATCH 018/286] mopidy-spotify: Update from 1.1.3 to 1.2.0 --- pkgs/applications/audio/mopidy-spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 5c78ef6ba14c..6223ffb0d81f 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-spotify-${version}"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "09s6841qb24nrmlc2izb8vxbgv185ddra6ndskrsw907hfli2kl6"; + sha256 = "1fgxakylsx0nggis11v6bxfy8h3dl1n1v86liyfcj0xazb1mx69m"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; From ccc22bb6620020e315685d6f5ab627c8ffe3f4ce Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 28 Jul 2014 19:51:08 +0200 Subject: [PATCH 019/286] New package: mopidy-moped, a web client for the mopidy music player daemon --- .../audio/mopidy-moped/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-moped/default.nix diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix new file mode 100644 index 000000000000..8e3489a91223 --- /dev/null +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-moped-${version}"; + + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; + sha256 = "0sjp8vr4yfyjx233gamhg0p67zjnlpc9yq3szbw897igsh23j2yr"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/martijnboland/moped; + description = "A web client for Mopidy"; + license = licenses.mit; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a77343995df..37ee49acb10b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9178,6 +9178,8 @@ let mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; From 212f476c97e27292ac5337e29d24836b0bcd9303 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 28 Jul 2014 19:52:32 +0200 Subject: [PATCH 020/286] Add NixOS module for Mopidy, a music player daemon --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/mopidy.nix | 107 ++++++++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 nixos/modules/services/audio/mopidy.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a71f5152bd15..c337b9e61919 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -137,6 +137,7 @@ gitolite = 127; znc = 128; polipo = 129; + mopidy = 130; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -248,6 +249,7 @@ firebird = 127; znc = 128; polipo = 129; + mopidy = 130; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 68971551d89e..0c511a072a78 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -79,6 +79,7 @@ ./services/audio/alsa.nix ./services/audio/fuppes.nix ./services/audio/mpd.nix + ./services/audio/mopidy.nix ./services/backup/almir.nix ./services/backup/bacula.nix ./services/backup/mysql-backup.nix diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix new file mode 100644 index 000000000000..df3837d47f29 --- /dev/null +++ b/nixos/modules/services/audio/mopidy.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +with lib; + +let + + uid = config.ids.uids.mopidy; + gid = config.ids.gids.mopidy; + cfg = config.services.mopidy; + + mopidyConf = writeText "mopidy.conf" cfg.configuration; + + mopidyLauncher = stdenv.mkDerivation { + name = "mopidy-launcher"; + phases = [ "installPhase" ]; + buildInputs = [ makeWrapper python ]; + installPhase = '' + mkdir -p $out/bin + ln -s ${mopidy}/bin/mopidy $out/bin/mopidy + wrapProgram $out/bin/mopidy \ + --prefix PYTHONPATH : \ + "${concatStringsSep ":" (map (p: "$(toPythonPath ${p})") cfg.extensionPackages)}" + ''; + }; + +in { + + options = { + + services.mopidy = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable Mopidy, a music player daemon. + ''; + }; + + dataDir = mkOption { + default = "/var/lib/mopidy"; + type = types.str; + description = '' + The directory where Mopidy stores its state. + ''; + }; + + extensionPackages = mkOption { + default = []; + type = types.listOf types.package; + example = [ mopidy-spotify ]; + description = '' + Mopidy extensions that should be loaded by the service. + ''; + }; + + configuration = mkOption { + type = types.lines; + description = '' + The configuration that Mopidy should use. + ''; + }; + + extraConfigFiles = mkOption { + default = []; + type = types.listOf types.str; + description = '' + Extra config file read by Mopidy when the service starts. + Later files in the list overrides earlier configuration. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.mopidy = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "sound.target" ]; + description = "mopidy music player daemon"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; + serviceConfig = { + ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}"; + User = "mopidy"; + PermissionsStartOnly = true; + }; + }; + + users.extraUsers.mopidy = { + inherit uid; + group = "mopidy"; + extraGroups = [ "audio" ]; + description = "Mopidy daemon user"; + home = "${cfg.dataDir}"; + }; + + users.extraGroups.mopidy.gid = gid; + + }; + +} From f5d0d8dbf185aef1c63dc2c5ecaff2ea33ea1479 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 28 Jul 2014 20:12:19 +0200 Subject: [PATCH 021/286] elasticsearch: Fix error in NixOS module, systemd ExecStart path must be absolute. --- nixos/modules/services/search/elasticsearch.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index c99d1e229677..b74ef4370d76 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -122,9 +122,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = { ES_HOME = cfg.dataDir; }; - path = [ pkgs.elasticsearch ]; serviceConfig = { - ExecStart = "elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; + ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; PermissionsStartOnly = true; }; From bde992bbbc7148255d439cbb8b54a772b81e89eb Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 22 Feb 2014 15:56:59 +0100 Subject: [PATCH 022/286] pkgsi686Linux: Use 32b kernels (x86_64 kernels can't be built with 32b gcc). --- pkgs/top-level/all-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37ee49acb10b..70043019615a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -153,15 +153,16 @@ let # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: (import ./all-packages.nix) { + forceSystem = system: kernel: (import ./all-packages.nix) { inherit system; + platform = platform // { kernelArch = kernel; }; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem platform; + crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux"; + pkgsi686Linux = forceSystem "i686-linux" "i386"; callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); From eec522e69acde44e6dac25e4175b26cc51436346 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 11:51:08 +0200 Subject: [PATCH 023/286] haskell-nixpkgs.nix: update Cabal to version 1.20.0.2 --- .../haskell/Cabal/{1.20.0.1.nix => 1.20.0.2.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/libraries/haskell/Cabal/{1.20.0.1.nix => 1.20.0.2.nix} (90%) diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix similarity index 90% rename from pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix rename to pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix index 67faefb7a67b..35d0ddfd330c 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.20.0.1"; - sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m"; + version = "1.20.0.2"; + sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a81f8cae90ad..95894faa1a88 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -21,8 +21,8 @@ }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; mtl = self.mtl_2_1_2; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e587dbf9ab6..46333dc46410 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -334,7 +334,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; + Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; Cabal = null; # core package since forever cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; @@ -2932,9 +2932,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; cabalLenses = self.cabalLenses.override { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; }; }; @@ -2951,7 +2951,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_1; }; + cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_2; }; cabalInstall = self.cabalInstall_1_20_0_3; codex = callPackage ../development/tools/haskell/codex {}; From 7325894d72e573a3eb6dea89dcf1dd82a39cb578 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:01:48 +0200 Subject: [PATCH 024/286] haskell-hflags: re-generate with cabal2nix --- pkgs/development/libraries/haskell/hflags/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index d2ac39f139c5..019815fd57c1 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; - license = self.stdenv.lib.licenses.asl20; + license = "unknown"; platforms = self.ghc.meta.platforms; }; }) From bdb77826d98544ab37741f740dd3516023924b27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:07:44 +0200 Subject: [PATCH 025/286] Remove obsolete jackaudio version 1. --- pkgs/applications/audio/a2jmidid/default.nix | 4 +-- pkgs/applications/audio/ardour/default.nix | 4 +-- pkgs/applications/audio/bristol/default.nix | 4 +-- pkgs/applications/audio/calf/default.nix | 4 +-- pkgs/applications/audio/distrho/default.nix | 4 +-- pkgs/applications/audio/drumkv1/default.nix | 4 +-- .../applications/audio/fluidsynth/default.nix | 4 +-- pkgs/applications/audio/guitarix/default.nix | 4 +-- pkgs/applications/audio/hydrogen/default.nix | 4 +-- pkgs/applications/audio/ingen/default.nix | 4 +-- .../audio/jack-capture/default.nix | 4 +-- .../audio/jack-oscrolloscope/default.nix | 4 +-- pkgs/applications/audio/jack-rack/default.nix | 4 +-- pkgs/applications/audio/jackmeter/default.nix | 4 +-- pkgs/applications/audio/jalv/default.nix | 4 +-- pkgs/applications/audio/lash/default.nix | 4 +-- .../audio/linuxsampler/default.nix | 4 +-- pkgs/applications/audio/lmms/default.nix | 4 +-- .../applications/audio/mhwaveedit/default.nix | 4 +-- .../audio/milkytracker/default.nix | 4 +-- pkgs/applications/audio/moc/default.nix | 4 +-- pkgs/applications/audio/petrifoo/default.nix | 4 +-- pkgs/applications/audio/projectm/default.nix | 4 +-- pkgs/applications/audio/puredata/default.nix | 4 +-- pkgs/applications/audio/qjackctl/default.nix | 4 +-- pkgs/applications/audio/qsynth/default.nix | 4 +-- pkgs/applications/audio/qtractor/default.nix | 4 +-- pkgs/applications/audio/rakarrack/default.nix | 4 +-- pkgs/applications/audio/samplv1/default.nix | 4 +-- pkgs/applications/audio/seq24/default.nix | 4 +-- pkgs/applications/audio/setbfree/default.nix | 4 +-- .../audio/sonic-visualiser/default.nix | 4 +-- pkgs/applications/audio/synthv1/default.nix | 4 +-- pkgs/applications/audio/vmpk/default.nix | 4 +-- .../audio/xsynth-dssi/default.nix | 4 +-- pkgs/applications/audio/yoshimi/default.nix | 4 +-- .../audio/zynaddsubfx/default.nix | 4 +-- pkgs/applications/misc/blender/default.nix | 4 +-- .../networking/mumble/default.nix | 6 ++-- pkgs/applications/video/mplayer/default.nix | 6 ++-- pkgs/applications/video/mplayer2/default.nix | 6 ++-- pkgs/applications/video/mpv/default.nix | 6 ++-- .../video/simplescreenrecorder/default.nix | 4 +-- pkgs/applications/video/vlc/default.nix | 4 +-- .../interpreters/supercollider/default.nix | 4 +-- pkgs/development/libraries/aubio/default.nix | 4 +-- pkgs/development/libraries/dssi/default.nix | 2 +- .../libraries/haskell/jack/default.nix | 4 +-- pkgs/development/libraries/mlt/default.nix | 4 +-- pkgs/misc/emulators/mednafen/default.nix | 4 +-- pkgs/misc/jackaudio/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 30 ------------------- .../linux/alsa-plugins/default.nix | 6 ++-- pkgs/servers/pulseaudio/default.nix | 6 ++-- pkgs/tools/misc/timidity/default.nix | 6 ++-- pkgs/top-level/all-packages.nix | 7 ++--- pkgs/top-level/python-packages.nix | 2 +- 57 files changed, 116 insertions(+), 149 deletions(-) delete mode 100644 pkgs/misc/jackaudio/jack1.nix diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 38192311ccfa..c5e35d8867c8 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }: +{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }: stdenv.mkDerivation rec { name = "a2jmidid-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; - buildInputs = [ alsaLib dbus jack2 pkgconfig python ]; + buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index afc2e49fc8af..88bc7399c65e 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 +, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo + glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 makeWrapper pango perl pkgconfig python serd sord sratom suil diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index b27ac0586025..5eb4f0c4e9f1 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext xlibs.xproto ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index efab9202025d..6ed4b7cce98b 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH + cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index aa3a76c3af13..809a02e1c7a5 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2 +{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio , libxslt, lv2, pkgconfig, premake3, xlibs }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3 + alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3 xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xlibs.libXinerama xlibs.libXrender ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 34950d1a343d..ab8027e23711 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }: +{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }: stdenv.mkDerivation rec { name = "drumkv1-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; }; - buildInputs = [ jack2 libsndfile lv2 qt4 ]; + buildInputs = [ jackaudio libsndfile lv2 qt4 ]; meta = with stdenv.lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8cba482194e5..89e95f62cd5f 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig +{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig , pulseaudio }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-framework CoreAudio"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 777c0ddb2e35..e7fb44af2008 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk -, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2 +, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2 , pkgconfig, python }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2 + avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio ladspaH librdf libsndfile lv2 pkgconfig python ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 10f15f5882cb..74ff2a3407c4 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins +{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins , libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf + alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf libsndfile pkgconfig qt4 scons subversion ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ac46ff6140c1..73138cc269d0 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv +{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv , lv2, pkgconfig, python, raul, serd, sord, sratom, suil }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python + boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 2e6f6b0dd828..3b8f0f652a8b 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }: +{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }: stdenv.mkDerivation rec { name = "jack_capture-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; }; - buildInputs = [ jack2 libsndfile pkgconfig ]; + buildInputs = [ jackaudio libsndfile pkgconfig ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 7b4d12a5b877..dbceb0a336c5 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }: +{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }: stdenv.mkDerivation rec { name = "jack_oscrolloscope-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - buildInputs = [ SDL jack2 mesa pkgconfig ]; + buildInputs = [ SDL jackaudio mesa pkgconfig ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 8ac47c570dfb..1d1128e663d3 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ]; + buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 74d98184d9dd..158817b68be2 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jack2, pkgconfig }: +{ stdenv, fetchurl, jackaudio, pkgconfig }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - buildInputs = [ jack2 pkgconfig ]; + buildInputs = [ jackaudio pkgconfig ]; meta = { description = "Console jack loudness meter"; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 70ef5bdec5cb..2baf69cef4fd 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil + gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index e42babf13ef8..ad52e7b2d85c 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2 +{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper + buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper pkgconfig readline ]; postInstall = '' diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 2c4b26543ebb..1408a1775ee5 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }: +, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "linuxsampler-svn-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib asio autoconf automake bison jack2 libgig libsndfile + alsaLib asio autoconf automake bison jackaudio libgig libsndfile libtool lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 540777473d41..5195ddd42a13 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg , libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate + SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate libsndfile pkgconfig pulseaudio qt4 ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index a1e81be3cb37..a8287b10a298 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH +{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile + [ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile pkgconfig pulseaudio ]; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index eadbaabcf560..965c941113c3 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl +{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl , zlib, zziplib }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { export CPATH=${zlib}/lib ''; - buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ]; + buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index e5264f5c3d2f..e822e4057417 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg -, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag +, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag , libtool }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis - mpc libsndfile jack2 db libmodplug timidity libid3tag libtool + mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 152ee442761e..2e53a22bff3b 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas +{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs + [ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 pkgconfig ]; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 508b6743cc39..2dd251ddd5bd 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -2,7 +2,7 @@ , glew, ftgl, ttf_bitstream_vera , withQt ? true, qt4 , withLibvisual ? false, libvisual, SDL -, withJack ? false, jack2 +, withJack ? false, jackaudio , withPulseAudio ? true, pulseaudio }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { [ glew ftgl ] ++ optional withQt qt4 ++ optionals withLibvisual [ libvisual SDL ] - ++ optional withJack jack2 + ++ optional withJack jackaudio ++ optional withPulseAudio pulseaudio ; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 9abca0cb0141..d0394b72eddc 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, jack2, tk +, alsaLib, jackaudio, tk }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib jack2 ]; + buildInputs = [ alsaLib jackaudio ]; configureFlags = '' --enable-alsa diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index ba875255d4a0..834ccb751320 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }: +{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: stdenv.mkDerivation rec { version = "0.3.11"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl"; }; - buildInputs = [ qt4 alsaLib jack2 dbus ]; + buildInputs = [ qt4 alsaLib jackaudio dbus ]; configureFlags = "--enable-jack-version"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index a5d0e7e621e2..05e6da223dad 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }: +{ stdenv, fetchurl, alsaLib, fluidsynth, jackaudio, qt4 }: stdenv.mkDerivation rec { name = "qsynth-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw"; }; - buildInputs = [ alsaLib fluidsynth jack2 qt4 ]; + buildInputs = [ alsaLib fluidsynth jackaudio qt4 ]; meta = with stdenv.lib; { description = "Fluidsynth GUI"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index e589adc0e417..a15cf2550407 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib autoconf automake dssi gtk jack2 ladspaH + [ alsaLib autoconf automake dssi gtk jackaudio ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool libvorbis pkgconfig qt4 rubberband ]; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 257a9967a5b0..ba84fe5eaec2 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft, +{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jackaudio, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg + buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 7d8d5fc04abc..c201536ed347 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }: +{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }: stdenv.mkDerivation rec { name = "samplv1-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; }; - buildInputs = [ jack2 libsndfile lv2 qt4 ]; + buildInputs = [ jackaudio libsndfile lv2 qt4 ]; meta = with stdenv.lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 10376e02f433..9f168f54eafd 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtkmm, jackaudio, pkgconfig }: stdenv.mkDerivation rec { name = "seq24-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258"; }; - buildInputs = [ alsaLib gtkmm jack2 pkgconfig ]; + buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ]; meta = with stdenv.lib; { description = "minimal loop based midi sequencer"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 5119c384cf6a..0d5b69297538 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2 +{ stdenv, fetchurl, alsaLib, freetype, ftgl, jackaudio, libX11, lv2 , mesa, pkgconfig, ttf_bitstream_vera }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig + alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 42c390620427..7704397e6d0a 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,6 +1,6 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo +{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, pulseaudio, qt5, redland , rubberband, serd, sord, vampSDK @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sord pkgconfig # optional - jack2 + jackaudio # portaudio pulseaudio libmad diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 08c13243804b..d1c2230cf16d 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, jack2, lv2 }: +{ stdenv, fetchurl, qt4, jackaudio, lv2 }: stdenv.mkDerivation rec { name = "synthv1-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; }; - buildInputs = [ qt4 jack2 lv2 ]; + buildInputs = [ qt4 jackaudio lv2 ]; meta = with stdenv.lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 9a75fa5f3831..7fffa77b5a39 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, qt4, jack2 +, qt4, jackaudio }: let @@ -22,5 +22,5 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt4 jack2 ]; + buildInputs = [ qt4 jackaudio ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 85e7235400b2..0cfbfb4c9bd1 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2, +{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jackaudio, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH + buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH ladspaPlugins liblo pkgconfig ]; installPhase = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 497ab3ac78d6..df0b98cdd9e4 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, jack2, libsndfile, mesa, minixml, pkgconfig, zlib +, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }: assert stdenv ? glibc; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa + alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa minixml zlib ]; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index a5aa7d5c8d95..cd30b5b30847 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml +{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml , pkgconfig, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; - buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 13d0bfa7a423..c6a6fa7861ca 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,7 +2,7 @@ , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw -, jackaudioSupport ? false, jack2 +, jackaudioSupport ? false, jackaudio }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw - ] ++ optional jackaudioSupport jack2; + ] ++ optional jackaudioSupport jackaudio; postUnpack = '' diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 0f2a3d93cdbc..b2b2e37fd663 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, boost, protobuf, libsndfile , speex, libopus, avahi, pkgconfig , jackSupport ? false -, jack2 ? null +, jackaudio ? null , speechdSupport ? false , speechd ? null }: -assert jackSupport -> jack2 != null; +assert jackSupport -> jackaudio != null; assert speechdSupport -> speechd != null; let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 boost protobuf libsndfile speex libopus avahi pkgconfig ] - ++ (optional jackSupport jack2) + ++ (optional jackSupport jackaudio) ++ (optional speechdSupport speechd); installPhase = '' diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f3cef6db69f1..48fe5da27a09 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -15,7 +15,7 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null -, jackaudioSupport ? false, jack2 ? null +, jackaudioSupport ? false, jackaudio ? null , pulseSupport ? false, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -40,7 +40,7 @@ assert lameSupport -> lame != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ++ optional dvdnavSupport libdvdnav ++ optional bluraySupport libbluray ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport jackaudio ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 ++ optional pulseSupport pulseaudio diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index d8ada6372b10..dd4520fe2906 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -10,7 +10,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? false, jack2 ? null +, jackaudioSupport ? false, jackaudio ? null , pulseSupport ? true, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -28,7 +28,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport jackaudio ++ optional pulseSupport pulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3295640fa5ab..be796f8e0dea 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -14,7 +14,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? true, jack2 ? null +, jackaudioSupport ? true, jackaudio ? null , pulseSupport ? true, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -36,7 +36,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional dvdreadSupport libdvdread ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport jackaudio ++ optional pulseSupport pulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 14ce5e9684bd..3251127c7a19 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext +{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext , libXfixes, mesa, pkgconfig, pulseaudio, qt4 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig + alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig pulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 4b42bcd2859d..2c5b53c596a6 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -3,7 +3,7 @@ , pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg -, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image +, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec - udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib + udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index a8c967b59678..59fb9268372c 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, jack2, libsndfile, fftw, curl +, jackaudio, libsndfile, fftw, curl , libXt, qt, readline , useSCEL ? false, emacs }: @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - jack2 libsndfile fftw curl libXt qt readline ] + jackaudio libsndfile fftw curl libXt qt readline ] ++ optional useSCEL emacs; } diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 7a5351da10e0..53ff65720529 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate +{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate , libsndfile, pkgconfig, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python + alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index ae276c6aa0aa..951278b4433f 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM + , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig , ...}: builderDefsPackage diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix index 2e6b6ee1aa3a..acb4b0b7e570 100644 --- a/pkgs/development/libraries/haskell/jack/default.nix +++ b/pkgs/development/libraries/haskell/jack/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, enumset, eventList, explicitException, jack2, midi +{ cabal, enumset, eventList, explicitException, jackaudio, midi , nonNegative, transformers }: @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { buildDepends = [ enumset eventList explicitException midi nonNegative transformers ]; - pkgconfigDepends = [ jack2 ]; + pkgconfigDepends = [ jackaudio ]; meta = { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 00d586a9f04c..3d89d6c7d559 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate +{ stdenv, fetchurl, SDL, frei0r, jackaudio, libav, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2 + SDL frei0r jackaudio libav libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig qt sox ]; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index c7ef57357500..786ed21deccb 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libX11, mesa, freeglut -, jack2, libcdio, libsndfile, libsamplerate +, jackaudio, libcdio, libsndfile, libsamplerate , SDL, SDL_net, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ]; + [ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 4f9f071094bc..580d65838515 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { - name = "jack2-${version}"; + name = "jackaudio-${version}"; version = "1.9.9.5"; src = fetchurl { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix deleted file mode 100644 index d424452ecd58..000000000000 --- a/pkgs/misc/jackaudio/jack1.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid -, firewireSupport ? false, ffado ? null }: - -assert firewireSupport -> ffado != null; - -stdenv.mkDerivation rec { - name = "jack1-${version}"; - version = "0.124.1"; - - src = fetchurl { - url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; - sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; - }; - - preBuild = "echo ok"; - - configureFlags = '' - ${if firewireSupport then "--enable-firewire" else ""} - ''; - - buildInputs = - [ pkgconfig alsaLib db libuuid - ] ++ (stdenv.lib.optional firewireSupport ffado); - - meta = { - description = "JACK audio connection kit"; - homepage = "http://jackaudio.org"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 1a602858b7ab..802658ea2883 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }: stdenv.mkDerivation rec { name = "alsa-plugins-1.0.28"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig alsaLib libogg ] ++ stdenv.lib.optional (pulseaudio != null) pulseaudio - ++ stdenv.lib.optional (jack2 != null) jack2; + ++ stdenv.lib.optional (jackaudio != null) jackaudio; - meta = { + meta = { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 0665222a9e04..35922b3c46f0 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi , gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex , bluez, sbc, udev, libcap, json_c -, jackaudioSupport ? false, jack2 ? null +, jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs , useSystemd ? false, systemd ? null }: -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { name = "pulseaudio-5.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex json_c ] - ++ stdenv.lib.optional jackaudioSupport jack2 + ++ stdenv.lib.optional jackaudioSupport jackaudio ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] ++ stdenv.lib.optional useSystemd systemd ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ]; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index afe75c572c02..89ff6f4677fc 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }: +{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }: let inherit (composableDerivation) edf; in @@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} { }; jack = { audioModes = "jack"; - buildInputs = [jack2]; - NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"]; + buildInputs = [jackaudio]; + NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"]; }; } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70043019615a..0093566949e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7060,7 +7060,7 @@ let alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { - jack2 = null; + jackaudio = null; }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; @@ -11059,10 +11059,7 @@ let hplipWithPlugin = hplip.override { withPlugin = true; }; - # using the new configuration style proposal which is unstable - jack1 = callPackage ../misc/jackaudio/jack1.nix { }; - - jack2 = callPackage ../misc/jackaudio { }; + jackaudio = callPackage ../misc/jackaudio { }; keynav = callPackage ../tools/X11/keynav { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee29b74f72e5..2355d50efcaf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2654,7 +2654,7 @@ rec { sed -i "/use_setuptools/d" setup.py ''; - buildInputs = [ pkgs.alsaLib pkgs.jack2 ]; + buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; meta = with stdenv.lib; { description = "A Python wrapper for the RtMidi C++ library written with Cython"; From 95199088ed84de74ffb7c83e6f16369d498c2565 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:11:15 +0200 Subject: [PATCH 026/286] haskell-thyme: re-generate with cabal2nix --- pkgs/development/libraries/haskell/thyme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index dbf78bac9030..187637011264 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,15 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl +{ cabal, aeson, attoparsec, Cabal, cpphs, deepseq, filepath, mtl , profunctors, QuickCheck, random, systemPosixRedirect, text, time -, vector, vectorSpace, vectorThUnbox, cpphs +, vector, vectorSpace, vectorThUnbox }: cabal.mkDerivation (self: { pname = "thyme"; version = "0.3.5.2"; sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; - buildTools = [ cpphs ]; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox @@ -18,6 +17,7 @@ cabal.mkDerivation (self: { attoparsec Cabal filepath mtl profunctors QuickCheck random systemPosixRedirect text time vectorSpace ]; + buildTools = [ cpphs ]; doCheck = false; meta = { homepage = "https://github.com/liyang/thyme"; From cadf6e1622eb93d2da69474d667c6eb2bafcbfd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:16:34 +0200 Subject: [PATCH 027/286] haskell-folds: update to version 0.6.2 --- pkgs/development/libraries/haskell/folds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix index 41a834dbd845..7e3fb5a2dc60 100644 --- a/pkgs/development/libraries/haskell/folds/default.nix +++ b/pkgs/development/libraries/haskell/folds/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "folds"; - version = "0.6.1"; - sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1"; + version = "0.6.2"; + sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa"; buildDepends = [ comonad contravariant lens pointed profunctors reflection semigroupoids tagged transformers vector From c526312445367809345de59e1aed70be235c54f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:16:40 +0200 Subject: [PATCH 028/286] haskell-free-game: update to version 1.1.78 --- .../libraries/haskell/free-game/1.1.nix | 25 ------------------- .../free-game/{1.0.5.nix => default.nix} | 4 +-- pkgs/top-level/haskell-packages.nix | 6 +---- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/free-game/1.1.nix rename pkgs/development/libraries/haskell/free-game/{1.0.5.nix => default.nix} (90%) diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix deleted file mode 100644 index 76139aa7e5d4..000000000000 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, boundingboxes, colors, controlBool, filepath, free -, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens -, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers -, vector, void -}: - -cabal.mkDerivation (self: { - pname = "free-game"; - version = "1.1"; - sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; - buildDepends = [ - boundingboxes colors controlBool filepath free freetype2 GLFWB - hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL - OpenGLRaw random reflection transformers vector void - ]; - jailbreak = true; - meta = { - homepage = "https://github.com/fumieval/free-game"; - description = "Create games for free"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/default.nix similarity index 90% rename from pkgs/development/libraries/haskell/free-game/1.0.5.nix rename to pkgs/development/libraries/haskell/free-game/default.nix index 16ee51d139fc..d2a0f33892fd 100644 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.0.5"; - sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; + version = "1.1.78"; + sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 46333dc46410..88d492455d25 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -830,11 +830,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; - freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { - boundingboxes = self.boundingboxes_0_1_1; - }; - freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {}; - freeGame = self.freeGame_1_1; + freeGame = callPackage ../development/libraries/haskell/free-game {}; fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; From 41ff906084d85ae5dd943b3376621778a633c632 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:16:57 +0200 Subject: [PATCH 029/286] haskell-easy-file: add version 0.2.0 --- .../libraries/haskell/easy-file/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/easy-file/default.nix diff --git a/pkgs/development/libraries/haskell/easy-file/default.nix b/pkgs/development/libraries/haskell/easy-file/default.nix new file mode 100644 index 000000000000..8ba73d74efee --- /dev/null +++ b/pkgs/development/libraries/haskell/easy-file/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, time }: + +cabal.mkDerivation (self: { + pname = "easy-file"; + version = "0.2.0"; + sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a"; + buildDepends = [ filepath time ]; + meta = { + homepage = "http://github.com/kazu-yamamoto/easy-file"; + description = "Cross-platform File handling"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 88d492455d25..4cf74b36a60e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -692,6 +692,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dyre = callPackage ../development/libraries/haskell/dyre {}; + easyFile = callPackage ../development/libraries/haskell/easy-file {}; + editDistance = callPackage ../development/libraries/haskell/edit-distance {}; editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {}; From 0aa0b7680cc8dd8305091a9ebb8cf652a7728c39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:12 +0200 Subject: [PATCH 030/286] haskell-parsers: update to version 0.12.1 --- .../libraries/haskell/parsers/{0.12.nix => 0.12.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parsers/{0.12.nix => 0.12.1.nix} (88%) diff --git a/pkgs/development/libraries/haskell/parsers/0.12.nix b/pkgs/development/libraries/haskell/parsers/0.12.1.nix similarity index 88% rename from pkgs/development/libraries/haskell/parsers/0.12.nix rename to pkgs/development/libraries/haskell/parsers/0.12.1.nix index bb383b078aa7..5c49d144a10e 100644 --- a/pkgs/development/libraries/haskell/parsers/0.12.nix +++ b/pkgs/development/libraries/haskell/parsers/0.12.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.12"; - sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3"; + version = "0.12.1"; + sha256 = "0g9grf713zhn23vgmb6mdrm8r5snq1xa8jqnj6pghydj6m4rh97v"; buildDepends = [ attoparsec charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4cf74b36a60e..d6d092a847d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1743,8 +1743,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {}; - parsers = self.parsers_0_12; + parsers_0_12_1 = callPackage ../development/libraries/haskell/parsers/0.12.1.nix {}; + parsers = self.parsers_0_12_1; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 8e6c0afd0fe9e88cb346cd7ff11b36c0fe8cff6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:36 +0200 Subject: [PATCH 031/286] haskell-nc-indicators: update to version 0.3 --- pkgs/applications/misc/nc-indicators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix index 026485c771b3..3198333cce25 100644 --- a/pkgs/applications/misc/nc-indicators/default.nix +++ b/pkgs/applications/misc/nc-indicators/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "nc-indicators"; - version = "0.2"; - sha256 = "0z3h0d3cl0xapysq5sh1rnbp8fg8adlq0x3i4ql9xin9in29q27q"; + version = "0.3"; + sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec gtk hflags lens pipes stm ]; From a62a2c303d0c3cb1396d20773b7f1a5f57c4ade7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:38 +0200 Subject: [PATCH 032/286] haskell-MFlow: update to version 0.4.5.6 --- .../libraries/haskell/MFlow/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index 8e5969bbf271..bfefa0bead26 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,29 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, acidState, aws, blazeHtml, blazeMarkup, caseInsensitive -, clientsession, conduit, conduitExtra, cpphs, extensibleExceptions -, hamlet, hscolour, httpConduit, httpTypes, monadloc, monadLogger -, mtl, network, parsec, persistent, persistentSqlite -, persistentTemplate, pwstoreFast, random, RefSerialize, resourcet -, safecopy, shakespeare, stm, TCache, tcacheAWS, text, time -, transformers, utf8String, vector, wai, waiExtra, warp, warpTls -, Workflow +{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession +, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes +, monadloc, mtl, parsec, pwstoreFast, random, RefSerialize +, resourcet, stm, TCache, text, time, transformers, utf8String +, vector, wai, waiExtra, warp, warpTls, Workflow }: cabal.mkDerivation (self: { pname = "MFlow"; - version = "0.4.5.5"; - sha256 = "0ggwzjxhw2xmp2m6a560pn5m0qfn80x5q23vrd2k9aqxh8n2k6i5"; - isLibrary = true; - isExecutable = true; + version = "0.4.5.6"; + sha256 = "12rgp4x2in3r1hf4j1fr5ih0x0mb54x1rdr1mjllbh8c09ricrah"; buildDepends = [ - acidState aws blazeHtml blazeMarkup caseInsensitive clientsession - conduit conduitExtra extensibleExceptions hamlet hscolour - httpConduit httpTypes monadloc monadLogger mtl network parsec - persistent persistentSqlite persistentTemplate pwstoreFast random - RefSerialize resourcet safecopy shakespeare stm TCache tcacheAWS - text time transformers utf8String vector wai waiExtra warp warpTls - Workflow + blazeHtml blazeMarkup caseInsensitive clientsession conduit + conduitExtra extensibleExceptions httpTypes monadloc mtl parsec + pwstoreFast random RefSerialize resourcet stm TCache text time + transformers utf8String vector wai waiExtra warp warpTls Workflow ]; buildTools = [ cpphs ]; meta = { From 6e9bfd2d927ac318419fd81861026795a1d1dc91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:40 +0200 Subject: [PATCH 033/286] haskell-adjunctions: update to version 4.2 --- pkgs/development/libraries/haskell/adjunctions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index 5b9cb5703d62..f02aa9df5dd0 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "adjunctions"; - version = "4.1.0.1"; - sha256 = "18p2pabid7dx96qcpd2ywv5mhjp55srhm5g013pn697jcxyq2xiv"; + version = "4.2"; + sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i"; buildDepends = [ comonad contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers void From 4b3ad3291b6137cf86766e16ef44b84c33bcdcc0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:42 +0200 Subject: [PATCH 034/286] haskell-atomic-primops: update to version 0.6.0.6 --- pkgs/development/libraries/haskell/atomic-primops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 127ee2b326c2..466a44290917 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.6.0.5"; - sha256 = "0xyvadhmhk2b6y6p52cfbjx1hs3zfcwfa5wx6cypaq4yi3csyl5k"; + version = "0.6.0.6"; + sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb"; buildDepends = [ primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; From c5bf78474bbde849274f844fbf1928a2d63dd0fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:45 +0200 Subject: [PATCH 035/286] haskell-bindings-GLFW: update to version 3.0.3.3 --- pkgs/development/libraries/haskell/bindings-GLFW/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix index 0ed43d795379..08e14a782bf1 100644 --- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix +++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bindings-GLFW"; - version = "3.0.3.2"; - sha256 = "1w4y2ha5x678fiyan79jd59mjrkf4q25v8049sj20fbmabgdqla9"; + version = "3.0.3.3"; + sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4"; buildDepends = [ bindingsDSL ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; extraLibraries = [ From 71859fe4ce5cadf41a00c226ca978c1d21ee0a95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:47 +0200 Subject: [PATCH 036/286] haskell-classy-prelude-conduit: update to version 0.9.3 --- .../libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index d6f67674db48..28e940f34896 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.2"; - sha256 = "07qdhha58yl1dq4mpbyrpjwzk2yhn8dbkg2qg2yaq1j780a6dwcv"; + version = "0.9.3"; + sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void From 5fde244c0717850834f4a7b36f9f41ed1067c943 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:49 +0200 Subject: [PATCH 037/286] haskell-classy-prelude: update to version 0.9.3 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 273147fcc62f..e45a6f256b9c 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.2"; - sha256 = "0n006ld2kifh2bmwgbzx282s7xxpcml9g433x132prcblw4axkgr"; + version = "0.9.3"; + sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv"; buildDepends = [ basicPrelude chunkedData enclosedExceptions exceptions hashable liftedBase monoTraversable semigroups stm systemFilepath text time From b614d0ad7b863f6f48912c0d71a9b9f277ebcefa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:51 +0200 Subject: [PATCH 038/286] haskell-cmdargs: update to version 0.10.9 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 6482751a7978..aa9dcb781c04 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.8"; - sha256 = "1gh6g655s5yjf55qlbpn7daw5f67j79znibs4dwrvhj985hb9a7p"; + version = "0.10.9"; + sha256 = "12phn22iri2v65gbxzl580mikkj05rwx4sjn5c31f871wp0538my"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 9fab47de52b31cd82489d3518937bbecfcb1c108 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:53 +0200 Subject: [PATCH 039/286] haskell-comonad: update to version 4.2.2 --- pkgs/development/libraries/haskell/comonad/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index da9908175443..36a0db0b9ccd 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, contravariant, distributive, doctest, filepath, semigroups -, tagged, transformers +, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "comonad"; - version = "4.2"; - sha256 = "161dgmjfff85sj6yijzgzyb4dvnn1zsm3q5q96qwypynj0am5sr7"; + version = "4.2.2"; + sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8"; buildDepends = [ contravariant distributive semigroups tagged transformers + transformersCompat ]; testDepends = [ doctest filepath ]; meta = { From add90789810d59d9c7f2c93f4390475b75672512 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:56 +0200 Subject: [PATCH 040/286] haskell-conduit-combinators: update to version 0.2.8.2 --- .../libraries/haskell/conduit-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index c1396751f108..17598dda06bd 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.6.1"; - sha256 = "01q585fwfl7qw5yr7ry1zfwm0lbmizyidifk9jzxdfxppbccfxfc"; + version = "0.2.8.2"; + sha256 = "1x2g333ygiv4jvwx4lw579kwx1z5m80cqfqgzv0pi5xdxcagy1ha"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet From 5c22263945cb48a7a4738935c4b59935385f5da2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:17:58 +0200 Subject: [PATCH 041/286] haskell-contravariant: update to version 1.1 --- .../libraries/haskell/contravariant/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index b3c549ecef86..91a586e56b22 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, tagged, transformers, transformersCompat }: +{ cabal, semigroups, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.6"; - sha256 = "031kwn2hpw25p2q0bhfgby0ihxjbcyv6w0v0nsj2zygif9jkfrrh"; - buildDepends = [ tagged transformers transformersCompat ]; + version = "1.1"; + sha256 = "0j2q6gl9f8jgknjqr2qzzxkb4fl7m9n5zjavnzan2arlv4viznhh"; + buildDepends = [ + semigroups tagged transformers transformersCompat + ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; From 15deeec1bc7e1af3a73a7c3279f0606c3c339951 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:00 +0200 Subject: [PATCH 042/286] haskell-dns: update to version 1.4.1 --- pkgs/development/libraries/haskell/dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 8da6475cfb6c..60a32ea092fd 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.4.0"; - sha256 = "1r004wpq0z98f6n3rqqlkqmb799sdldj5087icksi6rxxr3plrs9"; + version = "1.4.1"; + sha256 = "0q5ib797p0ay8lrlywaqyg736qh67mfdqwc53c1qhr5xrbcyvdir"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet From cd3c2b7ed7645b55e82576c7b51d3e4cb490c73b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:02 +0200 Subject: [PATCH 043/286] haskell-equivalence: update to version 0.2.5 --- pkgs/development/libraries/haskell/equivalence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/default.nix index 934468212244..38de239b821b 100644 --- a/pkgs/development/libraries/haskell/equivalence/default.nix +++ b/pkgs/development/libraries/haskell/equivalence/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "equivalence"; - version = "0.2.3"; - sha256 = "0dd986y0sn89fparyz6kz9yhzysbqjcp8s99r81ihghg7s9yc743"; + version = "0.2.5"; + sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3"; buildDepends = [ mtl STMonadTrans ]; testDepends = [ mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 From 595cfaadb7eba114054ec3d9b7b041cc7b0c1566 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:04 +0200 Subject: [PATCH 044/286] haskell-haskell-token-utils: update to version 0.0.0.5 --- .../libraries/haskell/haskell-token-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix index 378dfe898eae..2abbc8f324d5 100644 --- a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix +++ b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "haskell-token-utils"; - version = "0.0.0.4"; - sha256 = "0bb47g58m76293dw4h349j3fmajmw62rqna2kcgx681a1rsbpb4i"; + version = "0.0.0.5"; + sha256 = "01kyghzbs8w8ds0aczcdg2ib5b919r5vxgwg8iifbf220vlhd8mn"; buildDepends = [ dualTree ghcPaths ghcSybUtils haskellSrcExts monoidExtras mtl rosezipper semigroups syb From 9e7dd8705e24848f1781fe529fb850cb3a6de62d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:07 +0200 Subject: [PATCH 045/286] haskell-hp2any-graph: update to version 0.5.4.2 --- pkgs/development/libraries/haskell/hp2any-graph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index e6607c4e0afd..6d0d61a01fea 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hp2any-graph"; - version = "0.5.4.1"; - sha256 = "0cvli36lbipi29fw45mfpv35dn7ndbkxhpd3wjy9xn9gy8g0r9xx"; + version = "0.5.4.2"; + sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il"; isLibrary = true; isExecutable = true; buildDepends = [ From 653ed04b037ff853cfccd183d5853c6a0de481c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:09 +0200 Subject: [PATCH 046/286] haskell-hslua: update to version 0.3.13 --- pkgs/development/libraries/haskell/hslua/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix index 980de57605d6..e76ff36aab5d 100644 --- a/pkgs/development/libraries/haskell/hslua/default.nix +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hslua"; - version = "0.3.12"; - sha256 = "1cn6qxhvh8bxr9fisr4m4mqk6qwj69as63fkpf77a1xhmk31qlrf"; + version = "0.3.13"; + sha256 = "02j3hrzq3dgcv4bvf4xz14qxvzlb0vlxrf7lk9wqwdy43b978mz9"; buildDepends = [ mtl ]; pkgconfigDepends = [ lua ]; configureFlags = "-fsystem-lua"; From 8ba0c3eb04c253b731e1734da22c27b1e86c2a8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:11 +0200 Subject: [PATCH 047/286] haskell-kan-extensions: update to version 4.1 --- .../libraries/haskell/kan-extensions/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index 5f9aadd69697..c0ffaed799d3 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, adjunctions, comonad, contravariant, distributive, free -, mtl, pointed, semigroupoids, speculation, transformers +, mtl, pointed, semigroupoids, transformers }: cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.0.3"; - sha256 = "05zqlxm6i66d996jcpjhnmij28a4zwc0l0nc9cyxamfwmyd9754b"; + version = "4.1"; + sha256 = "1dg9q6rahgvsnsnd76r6a3harrllq3pzz9250cakgqip4n02dji1"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed - semigroupoids speculation transformers + semigroupoids transformers ]; meta = { homepage = "http://github.com/ekmett/kan-extensions/"; From 4fb51b17d32ccb364d6f2f60fcd8d41b22e9c7d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:13 +0200 Subject: [PATCH 048/286] haskell-lens: update to version 4.3.2 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 9b769d41ab52..e0f4d314e31b 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.3"; - sha256 = "0wvsf0vkqjmmgl3p5lxbypn4p126l927ip7l2iisqzwyk87zfqqy"; + version = "4.3.2"; + sha256 = "0bkdiggw3lzq18ijl9md0v6j847hx4qda0sqf9l6plf0b8yirryj"; buildDepends = [ aeson attoparsec bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive From 39b119926523adf3a38f2bbc4e93fa683e79fe66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:15 +0200 Subject: [PATCH 049/286] haskell-lifted-async: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/lifted-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index f5b6f711ab83..04c589b54792 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.2.0"; - sha256 = "1s8gz630v9xag0d5pjjwvfff87wvyy1w86ah7mvnylkarbdsac6l"; + version = "0.2.0.1"; + sha256 = "1x3qdgy0jkqx71xndjh769lw3wrwq63k2kc33pxn6x11yyklcf1j"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh From a80f691ea6a78555dfe2780eb4815a4cca4002b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:18 +0200 Subject: [PATCH 050/286] haskell-mongoDB: update to version 2.0.3 --- pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index d156c9c101ea..9fd2a441e365 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "2.0.2"; - sha256 = "02xq80jcrrp41gzzg7008spw3npj6iz3gcf1bkj4cf8vjs44nplf"; + version = "2.0.3"; + sha256 = "1blqd30mw9fl861f07zn7az4psl9byjjbd986884p6rx07m28abk"; buildDepends = [ binary bson cryptohash hashtables liftedBase monadControl mtl network parsec random randomShuffle text transformersBase From 6db5defffc69ccf92b319be47c266baccfba1047 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:20 +0200 Subject: [PATCH 051/286] haskell-mono-traversable: update to version 0.6.1 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 73685698f5e6..dfc34cc2a6a6 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.4"; - sha256 = "1svqxc96n2andxcgrv8s29hkq6nw1qigv5p0dw9vx2ynk68pfhww"; + version = "0.6.1"; + sha256 = "066yfffjkd0r6hg3y3zrs13jmyfgpl8ba9yvsbyawimvff7mfk5f"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms From 2074cd38509d18167799ef65de71ad94e65885ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:22 +0200 Subject: [PATCH 052/286] haskell-profunctors: update to version 4.1 --- .../libraries/haskell/profunctors/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index f9aa0481d43c..1c3268256fba 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -1,12 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, comonad, semigroupoids, tagged, transformers }: +{ cabal, comonad, distributive, semigroupoids, tagged, transformers +}: cabal.mkDerivation (self: { pname = "profunctors"; - version = "4.0.4"; - sha256 = "1hs6cs6y6zwf0c4jb92wnhp23qaxzw3xy7k07m9z98h8ziyqbqhx"; - buildDepends = [ comonad semigroupoids tagged transformers ]; + version = "4.1"; + sha256 = "1i8hscvznbca8wzjx521hwsinwab85gqshz49pdlkmdgydaagzxj"; + buildDepends = [ + comonad distributive semigroupoids tagged transformers + ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; From 6dfc5dc01ea76ed80c227dc41c16727905c35c89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:24 +0200 Subject: [PATCH 053/286] haskell-repa-algorithms: update to version 3.3.1.2 --- .../development/libraries/haskell/repa-algorithms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 8e9d668e389f..977ea58fac6e 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "3.2.5.1"; - sha256 = "1pk2w7qx1jfxqra66fflb71v6hmq6g05dss27kwhz0cdidpvcc7l"; + version = "3.3.1.2"; + sha256 = "12fizvma877ws3xiz3k34jg5xh5yhnl0n5aq2za005l9i5angkk9"; buildDepends = [ repa vector ]; extraLibraries = [ llvm ]; jailbreak = true; From a8b5bd5fe6d4b4b55edca2b31c68b45f697a2966 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:26 +0200 Subject: [PATCH 054/286] haskell-repa-examples: update to version 3.3.1.1 --- pkgs/development/libraries/haskell/repa-examples/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 48678480a355..54d8fe8329c3 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "3.2.5.1"; - sha256 = "0xrjfmwbq8mhcim261da7i68mp5jxkqiwjy2mhd1lgkr63m6x18j"; + version = "3.3.1.1"; + sha256 = "0gdkwmdnmvq82zglryxx2ic1nm4g2r4a0bwndiwbj670w03p712p"; isLibrary = false; isExecutable = true; buildDepends = [ From f33521699cbcfb0c683b9e43595ffb78a1f2959e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:29 +0200 Subject: [PATCH 055/286] haskell-repa-io: update to version 3.3.1.2 --- pkgs/development/libraries/haskell/repa-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index b42d165c5129..b679d59d5dc9 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.5.1"; - sha256 = "0aizsr6r1ybydpwqiamcdr4jhvqh0fiq9gbd7n17lrmnagyla5n8"; + version = "3.3.1.2"; + sha256 = "1i58ysk44y7s6z1jmns2fi83flqma4k5nsjh1pblqb2rgl7x0z5p"; buildDepends = [ binary bmp repa vector ]; jailbreak = true; meta = { From 4d54be786baa944bcfd098a16abafe40478df9e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:31 +0200 Subject: [PATCH 056/286] haskell-repa: update to version 3.3.1.2 --- pkgs/development/libraries/haskell/repa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 627b0572d981..b2c296a59239 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "3.2.5.1"; - sha256 = "0yrmia3ciagzrmrsmxh56qym4wc0malph7zhiw71gl9c9sp8hzvq"; + version = "3.3.1.2"; + sha256 = "0rsahd6c1mxd8hq9zfx4jqgmcfs4di4askky87y71xy5v4k1x4ai"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; From cb0e5f8e87affadc1a739a495f5242c067ac11bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:33 +0200 Subject: [PATCH 057/286] haskell-semigroupoids: update to version 4.0.4 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 97389362682b..037bef6b179e 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "4.0.2.1"; - sha256 = "00ga4spbnvwnk7j4h7zjw3bkd98glaganhcwq947ffadc0nansb1"; + version = "4.0.4"; + sha256 = "0yk536pbjblncpjinl739lppxsvb0w7z3hgrj43c0dqam0dyr38r"; buildDepends = [ comonad contravariant distributive semigroups transformers ]; From 8f625b50a361061a81eb6834c451d275d788b6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:35 +0200 Subject: [PATCH 058/286] haskell-semigroups: update to version 0.15.2 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 4d39b97bbae7..963a83ac5278 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.1"; - sha256 = "1vacnw598pl9acbcjjblrpdmjhmj3wz1ifrn9ki4q7yrsh4ml7mc"; + version = "0.15.2"; + sha256 = "1lh06d0mwivzbfjg635r3m39qcpyjvnwni7mspz96qb3zcm0c5kp"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; From 5d7bd07003b22c4b2005b8472cca02a428fff871 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:37 +0200 Subject: [PATCH 059/286] haskell-shakespeare: update to version 2.0.1.1 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index de6855ee19ed..12dc8124ada8 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "2.0.1"; - sha256 = "1h1b7p4czdzrxb77515vqnck3rj3yw35h2ds6gzxzp7pdxprds27"; + version = "2.0.1.1"; + sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p"; buildDepends = [ aeson blazeHtml blazeMarkup exceptions parsec systemFileio systemFilepath text time transformers From 69a1a8a43575bcb902284784819a930927ca4bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:40 +0200 Subject: [PATCH 060/286] haskell-sparse: update to version 0.9.1 --- pkgs/development/libraries/haskell/sparse/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix index c2fbf368f535..28389a860c86 100644 --- a/pkgs/development/libraries/haskell/sparse/default.nix +++ b/pkgs/development/libraries/haskell/sparse/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "sparse"; - version = "0.9"; - sha256 = "0v0z7kjgmcdx9ajlhr9pc1i3qqghd60s02xnlmj4hcxby8k0r8mc"; + version = "0.9.1"; + sha256 = "1pa1h21ca710fdjz60b79jg0v2lr0l11avpiynp9n1cw5bz137fk"; buildDepends = [ contravariant deepseq hybridVectors lens primitive transformers vector vectorAlgorithms @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { QuickCheck semigroups simpleReflect testFramework testFrameworkQuickcheck2 testFrameworkTh transformers vector ]; - patchPhase = '' - sed -i -e 's|vector-algorithms >=.*|vector-algorithms|' -e 's|QuickCheck.*,|QuickCheck,|' sparse.cabal - ''; doCheck = false; meta = { homepage = "http://github.com/ekmett/sparse"; From 55b8994ac7595a588df44a7ddcf7919f9550a63a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:42 +0200 Subject: [PATCH 061/286] haskell-statistics: update to version 0.13.1.1 --- pkgs/development/libraries/haskell/statistics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 3d879f12b9d4..4bb356a44434 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.13.1.0"; - sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd"; + version = "0.13.1.1"; + sha256 = "1ghb2snbacbfzxqcrvdiihvw2iip1m8rq9y62x1ayg6k13agm7r5"; buildDepends = [ aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances From e3e77ec115689a68666ff3d38e33dc618cf4caf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:44 +0200 Subject: [PATCH 062/286] haskell-taggy: update to version 0.1.2 --- pkgs/development/libraries/haskell/taggy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix index 9ddde26cbcf8..d94a3b27f2c3 100644 --- a/pkgs/development/libraries/haskell/taggy/default.nix +++ b/pkgs/development/libraries/haskell/taggy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "taggy"; - version = "0.1.1"; - sha256 = "14m02hn5ikw6qv36xxw7j39fm07q2pbs0m504ij7lvaf5c3rngz5"; + version = "0.1.2"; + sha256 = "0sj7da4yawfajyrd2gg2dxzgj5n99mdm5cz3bdhfipas4bb4216y"; isLibrary = true; isExecutable = true; buildDepends = [ From 63005f734fd7c0d2a8c055e9fd9c0150bfb6b3e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:46 +0200 Subject: [PATCH 063/286] haskell-trifecta: update to version 1.5.1 --- pkgs/development/libraries/haskell/trifecta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 4710189f9137..a73f47afb1c2 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "trifecta"; - version = "1.4.3"; - sha256 = "0kc8ykvh8m9yhyrkd9kx5xkv5ag99384k06xdi6ynjqv9wj6gfzg"; + version = "1.5.1"; + sha256 = "1fayr6sd9m84rqpcygacafn9vr9zva7rmkpvyzz0bf1p1z7i6b2n"; buildDepends = [ ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup charset comonad deepseq fingertree hashable lens mtl parsers From 2d604d3416bc5a4d0dab8b2888a1ef58d0a901a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:48 +0200 Subject: [PATCH 064/286] haskell-tz: update to version 0.0.0.8 --- pkgs/development/libraries/haskell/tz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix index 3de1fafd5821..3f964f2ce3d1 100644 --- a/pkgs/development/libraries/haskell/tz/default.nix +++ b/pkgs/development/libraries/haskell/tz/default.nix @@ -7,12 +7,12 @@ cabal.mkDerivation (self: { pname = "tz"; - version = "0.0.0.6"; - sha256 = "0yn2c016fzqwbgdrqp5hjn95gzp4w3gqjgax1w6wkg97bksdlq27"; + version = "0.0.0.8"; + sha256 = "0rabdqwdj8hx17817zsfsih01agx7n3kja8s0axmm0drq22vlflv"; buildDepends = [ binary deepseq time tzdata vector ]; testDepends = [ bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkTh time tzdata + testFrameworkQuickcheck2 testFrameworkTh time tzdata vector ]; preConfigure = "export TZDIR=${pkgs_tzdata}/share/zoneinfo"; meta = { From df253270e4d3a9139e1f063fe1360c4c4a69625e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:51 +0200 Subject: [PATCH 065/286] haskell-tzdata: update to version 0.1.20140612.0 --- pkgs/development/libraries/haskell/tzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix index b149a59489ab..ceae46792475 100644 --- a/pkgs/development/libraries/haskell/tzdata/default.nix +++ b/pkgs/development/libraries/haskell/tzdata/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tzdata"; - version = "0.1.20140324.0"; - sha256 = "19cw8wag2d5jx9dxia3gr8qjr3bh77a2kp7ksyqp58xxmvmsqdn4"; + version = "0.1.20140612.0"; + sha256 = "03fd3jiw89c8zf2jdz0qps8sb8ipgmjqbbaq4y2aqczv36ha74gh"; buildDepends = [ vector ]; testDepends = [ filemanip filepath HUnit MissingH testFramework testFrameworkHunit From 27b7ae9b62404de61ecbb7e325ccaba5d958dcaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:53 +0200 Subject: [PATCH 066/286] haskell-vector-algorithms: update to version 0.6.0.3 --- .../libraries/haskell/vector-algorithms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 00258e7f3f61..5c8dcc4c5ebf 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.6.0.2"; - sha256 = "1gn2pvgvm9g0dajx2wv305fxwhkpdj9pybrwrm3j2frl4dnj7dcq"; + version = "0.6.0.3"; + sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4"; isLibrary = true; isExecutable = true; buildDepends = [ mtl mwcRandom primitive vector ]; From 93e75667cfab79db1ed00c8fc1828c92275a08ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:55 +0200 Subject: [PATCH 067/286] haskell-wai-logger: update to version 2.1.2 --- .../libraries/haskell/wai-logger/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index b7c62845cb97..a94742ea2e7c 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, blazeBuilder, byteorder, caseInsensitive, doctest -, fastLogger, httpTypes, network, unixTime, wai, waiTest +, easyFile, fastLogger, httpTypes, network, unixTime, wai, waiTest }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "2.1.1"; - sha256 = "1cdl5nglb8jghi0yndpabraihgh681m5q1j77wsxzckxisga73j8"; + version = "2.1.2"; + sha256 = "0rfgcq433k5jpdgwyzrzgiy5h66bb38xfqzb63gmqabysr8wa9kl"; buildDepends = [ - blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - unixTime wai + blazeBuilder byteorder caseInsensitive easyFile fastLogger + httpTypes network unixTime wai ]; testDepends = [ doctest waiTest ]; doCheck = false; From ad0bd2a79596ac5631eaefb7838e19ea789905e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:57 +0200 Subject: [PATCH 068/286] haskell-yesod-auth: update to version 1.3.2 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b439d24afe6c..787944e1a6c1 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.1.1"; - sha256 = "0mw04v8gnhv9gnv7kv2v1x5df63zjdmi52r5bv1fzqay1s5b83ir"; + version = "1.3.2"; + sha256 = "0k0p5wjrczy2hiplz9wqav88sp4g24w9qvx7vzaii1zlslbmfnnf"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable From 9ded0e831e9231806984528fc804e5dd27f545a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:18:59 +0200 Subject: [PATCH 069/286] haskell-yesod-bin: update to version 1.2.12 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 4e02a157e342..864602a3a53f 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.11"; - sha256 = "15bxl52ky0ihm7ak71g6cvb9bac4zvmb8sh74fbjkckmpgh8r3m2"; + version = "1.2.12"; + sha256 = "0ksl78k27sshp9l6x7blv5csswv6vb8k632ggj9whnp8akzn37x1"; isLibrary = false; isExecutable = true; buildDepends = [ From 510a784242eac09a5628284d5a64bf46b1dcd949 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:19:02 +0200 Subject: [PATCH 070/286] haskell-yesod-core: update to version 1.2.18 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 96995f24d31d..89f096024104 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.17"; - sha256 = "199zj9yz5nmk4h2dwz4zlix3wf1z5fl9a8jg8cr4z6ldgskcfis1"; + version = "1.2.18"; + sha256 = "08d62wjx8smvi75490fp2f5ayv5jsgkxqi33lqhv9lxgv3ckk8vi"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie From 4886d942b9ecdf57bd4527d55a238a0d5f6bac9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:19:04 +0200 Subject: [PATCH 071/286] haskell-yesod-form: update to version 1.3.13 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 26f0735f723d..2fcd8f5a0f94 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.11"; - sha256 = "15c4qyvz1mn56pl9add865lm351wjhdhrbzm87py2jliglm905n0"; + version = "1.3.13"; + sha256 = "1asywf0a75gj3d55g700132m49mglim23kxqczrx10ll1k076sfw"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet From f74d211818f7b78ae07a4b62dae45f669109ca82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:19:06 +0200 Subject: [PATCH 072/286] haskell-yesod-routes: update to version 1.2.0.7 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index f537a119a455..1c7eba504cbc 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.6"; - sha256 = "0hd2f2w9pb865fn9qijh3j73sc1x7gzd4c0q5mgjy9lh9hd4kzix"; + version = "1.2.0.7"; + sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From 86dc30daa68d1213c4cb06919d2a7573724915de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:19:08 +0200 Subject: [PATCH 073/286] haskell-keter: update to version 1.3.3 --- pkgs/development/tools/haskell/keter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 496ba1d3e489..34bc45e74716 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.2"; - sha256 = "1vmn7aaljwg3gv6vbj9z5w2mffsls5d6mzs4rg9s3rh8khb14cr0"; + version = "1.3.3"; + sha256 = "1i4yjzqp8if0h88k8ga0dvqbrh57nvcr9dbfbj1sdw40pd74yb3i"; isLibrary = true; isExecutable = true; buildDepends = [ From 02bd9347384b548311e0f3978635cb355d12aab3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:19:10 +0200 Subject: [PATCH 074/286] haskell-LambdaHack: update to version 0.2.14 --- pkgs/games/LambdaHack/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c52ce057df24..d0ce2b08c4f9 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,26 +1,31 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath -, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, vector +{ cabal, assertFailure, async, binary, deepseq, enummapsetTh +, filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow +, random, stm, text, transformers, unorderedContainers, vector , vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.12"; - sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n"; + version = "0.2.14"; + sha256 = "1nygyzrgzrv7qfr153xvkh50p0sjrbv3jbif7qmpam5jjlw26ahs"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure binary deepseq enummapsetTh filepath gtk hashable + assertFailure async binary deepseq enummapsetTh filepath gtk + hashable hsini keys miniutter mtl prettyShow random stm text + transformers unorderedContainers vector vectorBinaryInstances zlib + ]; + testDepends = [ + assertFailure async binary deepseq enummapsetTh filepath hashable hsini keys miniutter mtl prettyShow random stm text transformers unorderedContainers vector vectorBinaryInstances zlib ]; jailbreak = true; meta = { - homepage = "http://github.com/kosmikus/LambdaHack"; - description = "A roguelike game engine in early and active development"; + homepage = "http://github.com/LambdaHack/LambdaHack"; + description = "A roguelike game engine in early development"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 9d56d25673197d74cd651fd0575855014254132c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 12:20:20 +0200 Subject: [PATCH 075/286] haskell-vty: update to version 5.1.3 --- .../libraries/haskell/vty/{5.1.1.nix => 5.1.3.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 1 - pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/vty/{5.1.1.nix => 5.1.3.nix} (93%) diff --git a/pkgs/development/libraries/haskell/vty/5.1.1.nix b/pkgs/development/libraries/haskell/vty/5.1.3.nix similarity index 93% rename from pkgs/development/libraries/haskell/vty/5.1.1.nix rename to pkgs/development/libraries/haskell/vty/5.1.3.nix index 708eb9581c61..412be2c2001e 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.1.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.3.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.1"; - sha256 = "043vrazb8w6ljq14i390cwcmavgmbnjbs6sl6w0yx8cwb4f7djr5"; + version = "5.1.3"; + sha256 = "0li20ypydal2xab5hpcwi2az78j2hsdwfx3cv7hinsc55w08wchj"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 95894faa1a88..45c3ab9cb953 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -49,7 +49,6 @@ networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 - vty_5_1_1 = super.vty_5_1_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d6d092a847d1..e6dfd078bd71 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2571,8 +2571,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_1_1 = callPackage ../development/libraries/haskell/vty/5.1.1.nix {}; - vty = self.vty_4_7_5; + vty_5_1_3 = callPackage ../development/libraries/haskell/vty/5.1.3.nix {}; + vty = self.vty_5_1_3; vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; From 559f423417ea98a50ad0b96a48f23501f80141a6 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 19 Mar 2014 09:57:21 +0100 Subject: [PATCH 076/286] gnu: Fix (evaluation of the) call to forceSystem. --- pkgs/os-specific/gnu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 27b1cdd3e8a8..94bfec0a18ec 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -82,7 +82,7 @@ let mig = callPackage ./mig { # Build natively, but force use of a 32-bit environment because we're # targeting `i586-pc-gnu'. - stdenv = (forceSystem "i686-linux").stdenv; + stdenv = (forceSystem "i686-linux" "i386").stdenv; }; # XXX: Use this one for its `.crossDrv'. Using the one above from From 5cc55e952335c7303fb238583359ae76d916b62f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 20:51:40 +0200 Subject: [PATCH 077/286] Partially revert 7a45996 some more. Removing more references to the non-existent license "stdenv.lib.licenses.perl5". Thanks to @FlashKorten for catching those. --- pkgs/applications/misc/d4x/default.nix | 2 +- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 2 +- pkgs/development/perl-modules/DBD-Pg/default.nix | 2 +- pkgs/games/simutrans/default.nix | 2 +- pkgs/tools/typesetting/biber/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index ce53045a15a9..d6ca3939d137 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = stdenv.lib.licenses.perl5; + license = "perl"; }; } diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 3b7f77ae96d1..93cef5d844cc 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -21,6 +21,6 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; meta = { - license = stdenv.lib.licenses.perl5; + license = "perl"; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 340c5805e9c9..619f2f14b96b 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -16,7 +16,7 @@ buildPerlPackage rec { meta = { homepage = http://search.cpan.org/dist/DBD-Pg/; description = "DBI PostgreSQL interface"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index ea050d278691..403fc88cb4ad 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = stdenv.lib.licenses.perl5; + license = "perl"; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 2ad9b0465658..1769a59520ba 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -33,7 +33,7 @@ buildPerlPackage { meta = { description = "Backend for BibLaTeX"; - license = stdenv.lib.licenses.perl5; + license = "perl"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; From 2aa89519a0ab476441ed27ec9c0fc3aa2400fd3d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Jul 2014 20:21:16 +0200 Subject: [PATCH 078/286] libtoxcore: Update to latest Git master. The GitHub repository has changed the name to "toxcore". Also indented buildInputs/configureFlags a bit less messy. Signed-off-by: aszlig --- .../libraries/libtoxcore/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index f7f0f79075d0..0926ab8a98d6 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,28 +2,31 @@ , libconfig, pkgconfig }: let - version = "388b1229b"; - date = "20140220"; + version = "e1158be5a6"; + date = "20140728"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; src = fetchurl { - url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; + url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "12vggiv0gyv8a2rd5qrv04b7yhfhxb7r0yh75gg5n4jdpcbhvgsd"; + sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; }; preConfigure = '' autoreconf -i ''; - configureFlags = [ "--with-libsodium-headers=${libsodium}/include" - "--with-libsodium-libs=${libsodium}/lib" - "--enable-ntox" ]; + configureFlags = [ + "--with-libsodium-headers=${libsodium}/include" + "--with-libsodium-libs=${libsodium}/lib" + "--enable-ntox" + ]; - buildInputs = [ autoconf libtool automake libsodium ncurses libconfig - pkgconfig ]; + buildInputs = [ + autoconf libtool automake libsodium ncurses libconfig pkgconfig + ]; doCheck = true; From 40548fce623e31570e66a02b1fa99c8be5269342 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Jul 2014 20:24:01 +0200 Subject: [PATCH 079/286] libtoxcore: Add libopus and libvpx to buildInputs. Those are necessary to do audio/video calls, which I guess is the whole point of the Tox project. Signed-off-by: aszlig --- pkgs/development/libraries/libtoxcore/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 0926ab8a98d6..48e78bc41315 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libconfig, pkgconfig }: +{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +, libvpx, libconfig, pkgconfig }: let version = "e1158be5a6"; @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf libtool automake libsodium ncurses libconfig pkgconfig + autoconf libtool automake libsodium ncurses libopus + libvpx libconfig pkgconfig ]; doCheck = true; From e542ff7288e3712d66e534659fddafce5ddda5f7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Jul 2014 20:27:20 +0200 Subject: [PATCH 080/286] libtoxcore: Enable and fix up running test suite. We not only require libcheck but also needed to disable a few tests, without providing the former, test cases were signalled as being run successfully but weren't actually run. Signed-off-by: aszlig --- pkgs/development/libraries/libtoxcore/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 48e78bc41315..6741838d33b6 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus -, libvpx, libconfig, pkgconfig }: +, libvpx, check, libconfig, pkgconfig }: let version = "e1158be5a6"; @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; }; + NIX_LDFLAGS = "-lgcc_s"; + + postPatch = '' + # within Nix chroot builds, localhost is unresolvable + sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ + auto_tests/network_test.c + # takes WAAAY too long (~10 minutes) and would timeout + sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ + auto_tests/tox_test.c + ''; + preConfigure = '' autoreconf -i ''; @@ -26,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf libtool automake libsodium ncurses libopus - libvpx libconfig pkgconfig + libvpx check libconfig pkgconfig ]; doCheck = true; From 9edfad2717498c4f405b5ce93e0808e708d780ef Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Jul 2014 20:43:53 +0200 Subject: [PATCH 081/286] toxic: Update to latest upstream Git master. Unfortunately they've changed their build system to be makefile-only and they don't seem to include test cases in the CLI anymore, so we needed to adapt accordingly. Also added freealut and openal to the buildInputs, in order to allow audio support. Signed-off-by: aszlig --- .../instant-messengers/toxic/default.nix | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4527d981a9f0..b3e1ff74cfa5 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libtoxcore, pkgconfig }: +, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "b308e19e6b"; - date = "20140224"; + version = "7566aa9d26"; + date = "20140728"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,26 +11,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma"; + sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; }; - preConfigure = '' - autoreconf -i - ''; + makeFlags = [ "-Cbuild" "VERSION=${version}" ]; + installFlags = [ "PREFIX=$(out)" ]; - NIX_LDFLAGS = "-lsodium"; - - configureFlags = [ - "--with-libtoxcore-headers=${libtoxcore}/include" - "--with-libtoxcore-libs=${libtoxcore}/lib" - "--with-libsodium-headers=${libtoxcore}/include" - "--with-libsodium-libs=${libtoxcore}/lib" + buildInputs = [ + autoconf libtool automake libtoxcore libsodium ncurses openal libvpx + freealut libconfig pkgconfig ]; - buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ]; - - doCheck = true; - meta = { description = "Reference CLI for Tox"; license = stdenv.lib.licenses.gpl3Plus; From 88a8b004c6cd8aa4e67cf4400077452df9b260ec Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Jul 2014 21:19:08 +0200 Subject: [PATCH 082/286] freealut: Clean up expression and add meta. Signed-off-by: aszlig --- pkgs/development/libraries/freealut/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 72d19875dec8..25ba89994e5d 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,10 +1,18 @@ -{stdenv, fetchurl, openal}: +{ stdenv, fetchurl, openal }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "freealut-1.1.0"; + src = fetchurl { - url = http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz; + url = "http://www.openal.org/openal_webstf/downloads/${name}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; - buildInputs = [openal]; + + buildInputs = [ openal ]; + + meta = { + homepage = "http://openal.org/"; + description = "Free implementation of OpenAL's ALUT standard"; + license = stdenv.lib.licenses.lgpl2; + }; } From 9bc1676e5ab6900697e7b34c50a3ca7b48f6a258 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Mon, 28 Jul 2014 01:00:59 +0300 Subject: [PATCH 083/286] Upgrade docker to 1.1.2 and add docker module This version of module has disabled socketActivation, because until nixos upgrade systemd to at least 214, systemd does not support SocketGroup. So socket is created with "root" group when socketActivation enabled. Should be fixed as soon as systemd upgraded. Includes changes from #3015 and supersedes #3028 --- lib/maintainers.nix | 1 + nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/docker.nix | 109 ++++++++++++++++++ .../virtualization/docker/default.nix | 15 +-- 5 files changed, 118 insertions(+), 9 deletions(-) create mode 100644 nixos/modules/virtualisation/docker.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7a5a7c254944..a4386b067b52 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -92,6 +92,7 @@ skeidel = "Sven Keidel "; smironov = "Sergey Mironov "; sprock = "Roger Mason "; + tailhook = "Paul Colomiets "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; thoughtpolice = "Austin Seipp "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c337b9e61919..4ba81dadb315 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -250,6 +250,7 @@ znc = 128; polipo = 129; mopidy = 130; + docker = 131; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c511a072a78..c444204c0b6a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -335,6 +335,7 @@ ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix + ./virtualisation/docker.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix new file mode 100644 index 000000000000..a0aa61353269 --- /dev/null +++ b/nixos/modules/virtualisation/docker.nix @@ -0,0 +1,109 @@ +# Systemd services for docker. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.docker; + +in + +{ + ###### interface + + options.virtualisation.docker = { + enable = + mkOption { + type = types.bool; + default = false; + description = + '' + This option enables docker, a daemon that manages + linux containers. Users in the "docker" group can interact with + the daemon (e.g. to start or stop containers) using the + docker command line tool. + ''; + }; + socketActivation = + mkOption { + type = types.bool; + default = false; + description = + '' + This option enables docker with socket activation. I.e. docker will + start when first called by client. + + Note: This is false by default because systemd lower than 214 that + nixos uses so far, doesn't support SocketGroup option, so socket + created by docker has root group now. This will likely be changed + in future. So set this option explicitly to false if you wish. + ''; + }; + extraOptions = + mkOption { + type = types.str; + default = ""; + description = + '' + The extra command-line options to pass to + docker daemon. + ''; + }; + + + }; + + ###### implementation + + config = mkIf cfg.enable (mkMerge [ + { environment.systemPackages = [ pkgs.docker ]; + } + (mkIf cfg.socketActivation { + + systemd.services.docker = { + description = "Docker Application Container Engine"; + after = [ "network.target" "docker.socket" ]; + requires = [ "docker.socket" ]; + serviceConfig = { + ExecStart = "${pkgs.docker}/bin/docker --daemon=true --host=fd:// --group=docker ${cfg.extraOptions}"; + # I'm not sure if that limits aren't too high, but it's what + # goes in config bundled with docker itself + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + }; + }; + + systemd.sockets.docker = { + description = "Docker Socket for the API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "/var/run/docker.sock"; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "docker"; + }; + }; + }) + (mkIf (!cfg.socketActivation) { + + systemd.services.docker = { + description = "Docker Application Container Engine"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.docker}/bin/docker --daemon=true --group=docker ${cfg.extraOptions}"; + # I'm not sure if that limits aren't too high, but it's what + # goes in config bundled with docker itself + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + }; + + # Presumably some containers are running we don't want to interrupt + restartIfChanged = false; + }; + }) + ]); + +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d951fe124c9f..4a488a381abf 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,24 +3,21 @@ btrfsProgs, iptables, bash}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "0.10.0"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "14gmx119hd3j0c6rbks2mm83hk46s5wnnyvj8rhn25h0yp39pm5q"; + sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; }; - phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"]; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ]; - preBuild = '' - patchShebangs ./hack - ''; + dontStrip = true; buildPhase = '' + patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5" + export DOCKER_GITCOMMIT="d84a070" ./hack/make.sh dynbinary ''; @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://www.docker.io/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline tailhook ]; platforms = platforms.linux; }; } From cb7b871bd62274cca90de5f14cf50e7f4a11ba00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jul 2014 22:31:18 +0200 Subject: [PATCH 084/286] initrd: Include filesystem support for /nix, /var etc. --- nixos/modules/system/boot/stage-1.nix | 11 +++++++++++ nixos/modules/tasks/filesystems.nix | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index b6249b6c0915..01558b8f9b28 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -313,6 +313,13 @@ in example = "xz"; }; + boot.initrd.supportedFilesystems = mkOption { + default = [ ]; + example = [ "btrfs" ]; + type = types.listOf types.string; + description = "Names of supported filesystem types in the initial ramdisk."; + }; + fileSystems = mkOption { options.neededForBoot = mkOption { default = false; @@ -347,5 +354,9 @@ in # Prevent systemd from waiting for the /dev/root symlink. systemd.units."dev-root.device".text = ""; + boot.initrd.supportedFilesystems = + map (fs: fs.fsType) + (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); + }; } diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d350bc1b5d0e..4de16a776d42 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -124,13 +124,6 @@ in description = "Names of supported filesystem types."; }; - boot.initrd.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.string; - description = "Names of supported filesystem types in the initial ramdisk."; - }; - }; @@ -140,10 +133,6 @@ in boot.supportedFilesystems = map (fs: fs.fsType) fileSystems; - boot.initrd.supportedFilesystems = - map (fs: fs.fsType) - (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); - # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; From ead06339b86e6298f1eb2cc1f38a07f71cae99ec Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 28 Jul 2014 23:33:05 +0200 Subject: [PATCH 085/286] Add activationScript for TrackPoint configuration --- nixos/modules/tasks/trackpoint.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index d2d46c8c45a4..d1c6f8ac1565 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -50,6 +50,11 @@ with lib; '' ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" ''; + + system.activationScripts.trackpoint = + '' + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ''; }; } From 62596693556e2080092864113aefe60b12376084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 29 Jul 2014 00:15:53 +0200 Subject: [PATCH 086/286] SimpleScreenRecorder 0.2.2 -> 0.3.0 --- pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 3251127c7a19..1a04570e8c10 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0k1r1ilpk05qmwpnld95zxxk57qvyaq2r9f4i3la7y0xh9bz1gls"; + sha256 = "0caal8jq47d56ld57cdf2lr1ji350v09j5chgvgxv2pbqmqga4p5"; }; buildInputs = [ From ff15c31c37dc7f1b68432a9ea74b84e89d3462b3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 29 Jul 2014 06:29:27 +0200 Subject: [PATCH 087/286] python-wrapper: Fix handling __future__ imports. The bazaar package is still broken even with 5f01cc7, because __future__ imports need to be the first imports before anything else. So this time I'm going to make the sed expression with explicit branching so we can properly match all the occasions we want to skip and insert the line modifying sys.argv[0] only _once_ and leave the command block after that one substitution. So no ugly swaps between hold and pattern space. The label which is resonsible for not escaping the command block is "r" and we jump to it as long as we need to skip something from the start of the file. While at it, I'm not only skipping every line with __future__ in it but also backslashes at the end of the line, so for example: ```python from __future__ import shiny_feature1, \ shiny_feature2, \ shiny_feature3 ``` ... will now be properly skipped as well. Tested against bazaar and nixops. Thanks to @edolstra for reporting this. Signed-off-by: aszlig --- pkgs/development/python-modules/generic/wrap.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index f81adf0bae93..0193bd828371 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,9 +26,12 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." - sed -i "$i" -e '1,/#!/ { /^#\!/,/^[^#]/ { - /^[^#]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' - }}' + sed -i "$i" -re '1 { + /^#!/!b; :r + /\\$/{n;n;n;b r} + /__future__|^ *(#.*)?$/{n;b r} + /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' + }' wrapProgram "$i" \ --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH From 21a2f99dd300385c98bdc32691d4631233441ff5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 29 Jul 2014 06:53:17 +0200 Subject: [PATCH 088/286] python-wrapper: Fix handling of line breaks. Not really critical for anything we have in I guess, but skipping lines three times really was a workaround and we're better off just appending the lines ending with backslash to the pattern space so we can accumulate all the crap until the last line of crap (crap, that is "broken lines"). Signed-off-by: aszlig --- pkgs/development/python-modules/generic/wrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 0193bd828371..857f002cace9 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -28,7 +28,7 @@ wrapPythonProgramsIn() { echo "wrapping \`$i'..." sed -i "$i" -re '1 { /^#!/!b; :r - /\\$/{n;n;n;b r} + /\\$/{N;b r} /__future__|^ *(#.*)?$/{n;b r} /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' }' From 355a46ec5d20d55f1dc81d8fd915d51fc2e6fc8d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 21 Jul 2014 16:19:17 +0200 Subject: [PATCH 089/286] Make the networkmanager group more discoverable This change makes the manual present the networkmanager group at several places to make sure new users see it. --- nixos/doc/manual/configuration.xml | 46 ++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 98686a19f1eb..051f0fb8c1e0 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -1036,21 +1036,22 @@ users.extraUsers.alice = { createHome = true; home = "/home/alice"; description = "Alice Foobar"; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "networkmanager" ]; useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; Note that alice is a member of the -wheel group, which allows her to use -sudo to execute commands as -root. Also note the SSH public key that allows -remote logins with the corresponding private key. Users created in -this way do not have a password by default, so they cannot log in via -mechanisms that require a password. However, you can use the -passwd program to set a password, which is retained -across invocations of nixos-rebuild. +wheel and networkmanager groups, +which allows her to use sudo to execute commands as +root and to configure the network, respectively. +Also note the SSH public key that allows remote logins with the +corresponding private key. Users created in this way do not have a +password by default, so they cannot log in via mechanisms that require +a password. However, you can use the passwd program +to set a password, which is retained across invocations of +nixos-rebuild. A user ID (uid) is assigned automatically. You can also specify a uid manually by adding @@ -1277,6 +1278,28 @@ services.xserver.synaptics.twoFingerScroll = true;
Networking +
NetworkManager + +To facilitate network configuration, some desktop environments +use NetworkManager. You can enable NetworkManager by setting: + + +services.networkmanager.enable = true; + + +Some desktop managers (e.g., GNOME) enable NetworkManager +automatically for you. + +All users that should have permission to change network settings +must belong to the networkmanager group. + +services.networkmanager and +services.wireless can not be enabled at the same time: +you can still connect to the wireless networks using +NetworkManager. + +
+
Secure shell access Secure shell (SSH) access to your machine can be enabled by @@ -1399,6 +1422,11 @@ always allowed.)
Wireless networks +For a desktop installation using NetworkManager (e.g., GNOME), +you just have to make sure the user is in the +networkmanager group and you can skip the rest of this +section on wireless networks. + NixOS will start wpa_supplicant for you if you enable this setting: From 2b8b29c3dd6ae26ddfe1e67b3ca70cf7de4e8cac Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 29 Jul 2014 11:56:20 +0200 Subject: [PATCH 090/286] spotify: Update from 0.9.10.17 to 0.9.11.27 (x86_64) --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b823ef02ef8f..2aedb4b3a949 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = if stdenv.system == "i686-linux" then "0.9.4.183.g644e24e.428" - else "0.9.10.17.g4129e1c.78"; + else "0.9.11.27.g2b1a638.81"; qt4webkit = if stdenv.system == "i686-linux" then @@ -73,7 +73,7 @@ stdenv.mkDerivation { else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "1a4vn2ij3nghnc0fq3nsyb95gwhaw4zabdq6jd52hxz8iv31pn1z"; + sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg"; } else throw "Spotify not supported on this platform."; From f7ef36428db741ad70f92b717a3f3d570d5ff41c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 29 Jul 2014 13:42:17 +0300 Subject: [PATCH 091/286] libzapojit: fix broken src url --- pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix index 5e2559899b77..5a8117528b68 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libzapojit-0.0.3"; src = fetchurl { - url = "mirror://gnome/sources//3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; From 938cd64a6ac0c7e5080801b0235589312823d9e6 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Thu, 10 Jul 2014 14:41:13 +0200 Subject: [PATCH 092/286] spotify: Fixed sha for i686 --- pkgs/applications/audio/spotify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2aedb4b3a949..59b82d155da9 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -15,7 +15,7 @@ let fetchurl { name = "libqtwebkit4_2.3.2_i386.deb"; url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_i386.deb; - sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924"; + sha256 = "0q4abhczx91ma57fjss0gn8j6nkfbfsbsh6kxhykzj88dih2s8rn"; } else fetchurl { From ec65a1e391ce7063a5ab8eac6b4d2e33082ae5b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 29 Jul 2014 02:57:50 +0200 Subject: [PATCH 093/286] erlang: Add manpages to all release packages. This puts manpages into "$out/lib/erlang/man" and also symlinks them into "$out/share/man" with an "erl" suffix (similar to how Debian is handling this) so those manpages are unlikely to collide with any other manpages, like for example inet(3). Closes #3396. Signed-off-by: aszlig Acked-by: Moritz Ulrich --- pkgs/development/interpreters/erlang/R14.nix | 14 ++++++++++++++ pkgs/development/interpreters/erlang/R15.nix | 14 ++++++++++++++ pkgs/development/interpreters/erlang/R16.nix | 13 ++++++++++++- pkgs/development/interpreters/erlang/R17.nix | 13 ++++++++++++- 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index 4dd32cd806c3..1fd101564a3b 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -22,6 +22,20 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; + }; + in '' + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix index e0760db9f58b..e9c8380c35ae 100644 --- a/pkgs/development/interpreters/erlang/R15.nix +++ b/pkgs/development/interpreters/erlang/R15.nix @@ -28,6 +28,20 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "0sqamzbd7qyz3klgl9vm1qvl0rhsfd1dx485pb0m2185qvw02nha"; + }; + in '' + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index eaf991ff5637..dd0fb3aec5f1 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -28,8 +28,19 @@ stdenv.mkDerivation rec { configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - postInstall = '' + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; + sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + }; + in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 5c59fddc1efc..b7cbfc486f5a 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -28,8 +28,19 @@ stdenv.mkDerivation rec { configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - postInstall = '' + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; + sha256 = "16dkz3w1q4ahy37c8a8r2h8zjcr7cxz7pd9z38chbxf6frc2pxxc"; + }; + in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done ''; # Some erlang bin/ scripts run sed and awk From 19fc92a8ed7a63ba4e296941ac804298f936d792 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jul 2014 15:32:58 +0200 Subject: [PATCH 094/286] nixos/tests/containers.nix: Don't ping This randomly fails with "Destination Host Unreachable". That shouldn't happen, since all interfaces/routes should be up after "nixos-container start" returns. Need more investigation... --- nixos/tests/containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index f7dc8eb491d6..a582e23fda02 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -35,7 +35,7 @@ import ./make-test.nix { # multi-user.target, we should now be able to access it. my $ip = $machine->succeed("nixos-container show-ip webserver"); chomp $ip; - $machine->succeed("ping -c1 $ip"); + #$machine->succeed("ping -c1 $ip"); # FIXME $machine->succeed("curl --fail http://$ip/ > /dev/null"); # Stop the container. From 18b27cf2e39ef72dd6e608901ea11fdeed775b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 29 Jul 2014 18:27:38 +0200 Subject: [PATCH 095/286] ardour: install a desktop file I based it on the desktop file from Arch Linux. --- pkgs/applications/audio/ardour/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 88bc7399c65e..ee093eb02afb 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -47,6 +47,21 @@ stdenv.mkDerivation rec { mkdir -pv $out/gtk2/engines cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 + + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/ardour.desktop" << EOF + [Desktop Entry] + Name=Ardour 3 + GenericName=Digital Audio Workstation + Comment=Multitrack harddisk recorder + Exec=$out/bin/ardour3 + Icon=$out/share/ardour3/icons/ardour_icon_256px.png + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; + EOF ''; meta = with stdenv.lib; { From d711c60c3d13adf8e176e25d7d255027e8ec5bd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:28 +0200 Subject: [PATCH 096/286] haskell-base-prelude: add version 0.1.3 --- .../libraries/haskell/base-prelude/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/base-prelude/default.nix diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix new file mode 100644 index 000000000000..824576293f45 --- /dev/null +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "base-prelude"; + version = "0.1.3"; + sha256 = "07s5j538zxd0hlazqqbz4nwa82rcrmv25v7jr6nxafmgn83mkqhx"; + meta = { + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed from only the \"base\" package"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e6dfd078bd71..f564b447961b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -225,6 +225,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; + basePrelude = callPackage ../development/libraries/haskell/base-prelude {}; + basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; benchpress = callPackage ../development/libraries/haskell/benchpress {}; From 3e551e05c667a8ab012296aa07e102ab5f68d7ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:38 +0200 Subject: [PATCH 097/286] haskell-conduit-extra: update to version 1.1.3 --- pkgs/development/libraries/haskell/conduit-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 5dc139d058f9..87fc9f18e761 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.2"; - sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi"; + version = "1.1.3"; + sha256 = "1gzvplaxplqia23g6l8z42w0z10y33yz594lxdk82g4i7swaagix"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers From f900746689f69e86d42df8d4b423422bda6acc1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:41 +0200 Subject: [PATCH 098/286] haskell-filestore: update to version 0.6.0.3 --- pkgs/development/libraries/haskell/filestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index fd33af07ee37..9fa673fd2860 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.6.0.2"; - sha256 = "0dbn358gxg13lxlpqyczcn5g5kvzrz7lv17qsmr53hvmxz8mricr"; + version = "0.6.0.3"; + sha256 = "03qmv3cqp1fv7b7pdjdx12cb27bfjbwwjdhkcvkfq89qwk9wh1h0"; buildDepends = [ Diff filepath parsec split time utf8String xml ]; testDepends = [ Diff filepath HUnit mtl time ]; jailbreak = true; From 5738b594009e5a8285a87a64f2ccd43e4608a0e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:44 +0200 Subject: [PATCH 099/286] haskell-profunctors: update to version 4.2 --- pkgs/development/libraries/haskell/profunctors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 1c3268256fba..248cd89a2ba0 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "4.1"; - sha256 = "1i8hscvznbca8wzjx521hwsinwab85gqshz49pdlkmdgydaagzxj"; + version = "4.2"; + sha256 = "0ikbp88798q7hdvi5vpc68q5bblsh43g9xnlwrifrn5fp3x3lq56"; buildDepends = [ comonad distributive semigroupoids tagged transformers ]; From 5fd8cff16009a4843d6f524b29e87bf885a265d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:46 +0200 Subject: [PATCH 100/286] haskell-stm-containers: update to version 0.1.3 --- .../libraries/haskell/stm-containers/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index d93bd1a03a8a..91105712a6a4 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -1,17 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, focus, free, hashable, HTF, lochTh, mtl, placeholders -, primitive, QuickCheck, unorderedContainers +{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl +, placeholders, primitive, QuickCheck, unorderedContainers }: cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.2"; - sha256 = "1rzxjspf0lzmviixnxv9f2wjxqhwv65fb1nws915ghs1sj774gab"; - buildDepends = [ focus hashable lochTh placeholders primitive ]; + version = "0.1.3"; + sha256 = "0ir2b6y1sqr0i68j0fqmwyysk7x9z18n84dbjppyjzzidcsrkar0"; + buildDepends = [ + basePrelude focus hashable lochTh placeholders primitive + ]; testDepends = [ - focus free hashable HTF lochTh mtl placeholders primitive - QuickCheck unorderedContainers + basePrelude focus free hashable HTF lochTh mtl placeholders + primitive QuickCheck unorderedContainers ]; doCheck = false; meta = { From 3b07c45fb79c345590560d6adedf1f5af678bd61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:49 +0200 Subject: [PATCH 101/286] haskell-wai-extra: update to version 3.0.1.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 76094cd0c0e9..4d63904a0926 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.1"; - sha256 = "1k6d9p93r7r95i5yi7mvhix94qigkzanqjq5qa6k7qfpnjj727id"; + version = "3.0.1.1"; + sha256 = "099pxahczai6ychsm04bwcvvd9m6lan5nqg159ny4jakpyk67zs8"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network From 877585bf3857a63e4ba3bd7e121cb7b8f960fb60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:52 +0200 Subject: [PATCH 102/286] haskell-yesod-auth: update to version 1.3.3 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 787944e1a6c1..3dcda2466880 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.2"; - sha256 = "0k0p5wjrczy2hiplz9wqav88sp4g24w9qvx7vzaii1zlslbmfnnf"; + version = "1.3.3"; + sha256 = "05kzsrb49r11yhsrn9j7vx90831qd1jni1h8wdj26qn85anxr10z"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable From 90939a0482ce1b70862b9ccbdf0dd684d1dba14e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 13:36:55 +0200 Subject: [PATCH 103/286] haskell-hlint: update to version 1.9.3 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 21825e787a07..83ffd0367e58 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.2"; - sha256 = "1pbcd4rzavhca3vydynasi3lk36pz948mqxp58rlb2j5dan9sw78"; + version = "1.9.3"; + sha256 = "1sdz981yq0amsw9q6hx0aqkd0ayrax5p77s3n3gz4bphpk37n09b"; isLibrary = true; isExecutable = true; buildDepends = [ From fc81ff49d2e4927c5b86cfabeaa4067f6760e41f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Jul 2014 18:31:03 +0200 Subject: [PATCH 104/286] LambdaHack: disable test suite to fix build https://github.com/LambdaHack/LambdaHack/issues/57 --- pkgs/games/LambdaHack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index d0ce2b08c4f9..3ddbbbdc5bf8 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -22,7 +22,7 @@ cabal.mkDerivation (self: { hsini keys miniutter mtl prettyShow random stm text transformers unorderedContainers vector vectorBinaryInstances zlib ]; - jailbreak = true; + doCheck = false; meta = { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A roguelike game engine in early development"; From 559eaeb2d2b9197d36505a5563c7185ed6371f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 29 Jul 2014 18:36:28 +0200 Subject: [PATCH 105/286] Revert "use wrapper to set LUA_PATH variable" This reverts commit 807cd4b4d40813ff1d801b0b17de3c421a465b1b, as it broke the 'awesome' package. It was also an incomplete change, only modifying lua-5.1 and none of the other lua versions. A better approach, if wanting lua to pick up external modules, would be to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build environments, so it should be safe. Conflicts: pkgs/development/interpreters/lua-5/5.1.nix --- pkgs/development/interpreters/lua-5/5.1.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 8fefcb0ec6db..74f80b911a0c 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, makeWrapper }: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; - buildInputs = [ readline makeWrapper ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]; @@ -35,9 +35,6 @@ stdenv.mkDerivation rec { sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua - wrapProgram $out/bin/lua \ - --set LUA_PATH '"$HOME/.nix-profile/lib/lua/5.1/?.lua;$HOME/.nix-profile/share/lua/5.1/?.lua"' \ - --set LUA_CPATH '"$HOME/.nix-profile/lib/lua/5.1/?.so;$HOME/.nix-profile/share/lua/5.1/?.so"' ''; meta = { From 47d50bf6846911c912de83f0853fd4cf81302290 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Jul 2014 13:08:37 -0500 Subject: [PATCH 106/286] kernel: 3.4.98 -> 3.4.100 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 455901932c2e..dcdb4af2dce8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.98"; + version = "3.4.100"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kkd6q80w4rh1sjdd4j5a2fmib4mjwhsf5fm555jl2w3zsy0kr45"; + sha256 = "170q4ay8kxf45b3932fpms37w4fh9h7pdiwc5wr64drg5j356pds"; }; kernelPatches = args.kernelPatches ++ From dd9a5aeade76eea574ed11f2abf7378bfc7e51ac Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Jul 2014 13:13:38 -0500 Subject: [PATCH 107/286] kernel: 3.10.48 -> 3.10.50 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 9f8c73f6ea7f..8780057da025 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.48"; + version = "3.10.50"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "14gz998vr9jb9blbk60phq3hwnl2yipd6fykkl5bd8gai5wph2l3"; + sha256 = "1ay7hscaa4nyvpa4l10y8himyj5fp25n63nxvrccqqqir3b8l1gz"; }; features.iwlwifi = true; From 2494e2bb095fa366db6a34889b93eb04cdbed56a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Jul 2014 13:15:42 -0500 Subject: [PATCH 108/286] kernel: 3.14.12 -> 3.14.14 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index f252080bbacc..4983dd0a16fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.12"; + version = "3.14.14"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pzshv7cj87v5na7paqka9v8mbqn04q25r241fha56sm7ilxbnap"; + sha256 = "0w9qp0jmfsrg9msgi6ab39kbz69id3xwnqvlgd9k4v6ka5bk7062"; }; features.iwlwifi = true; From ff747dd24f4ecae1d8d18b39dda777ae699f6d9f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Jul 2014 13:17:11 -0500 Subject: [PATCH 109/286] kernel: 3.15.5 -> 3.15.7 --- pkgs/os-specific/linux/kernel/linux-3.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 9fa77a7a38ef..86f03da4228d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15.5"; + version = "3.15.7"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "09j0ga3nc90fbfl9g3i8x9vp70hq7ddnnlbcazahrz4vn6mngqv2"; + sha256 = "034q34gib9jqfiydnqf5i827ns07apmkh2j48vbakdwydvzzv6fj"; }; features.iwlwifi = true; From 210452979adb21355f1a2c5dbcc16608713f9929 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Jul 2014 06:00:56 +0200 Subject: [PATCH 110/286] rust: Prepare for more versions part 1: - Factor out some things that REALLY shouldn't change between versions --- pkgs/development/compilers/rust/common.nix | 32 ++++++++++++++++ pkgs/development/compilers/rust/default.nix | 42 ++++++++------------- 2 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/compilers/rust/common.nix diff --git a/pkgs/development/compilers/rust/common.nix b/pkgs/development/compilers/rust/common.nix new file mode 100644 index 000000000000..4ba6f159b4ce --- /dev/null +++ b/pkgs/development/compilers/rust/common.nix @@ -0,0 +1,32 @@ +{stdenv, version}: + +{ + inherit version; + + platform = if stdenv.system == "i686-linux" + then "linux-i386" + else if stdenv.system == "x86_64-linux" + then "linux-x86_64" + else if stdenv.system == "x86_64-darwin" + then "macos-x86_64" + else abort "no snapshot to boostrap for this platform (missing platform url suffix)"; + + target = if stdenv.system == "i686-linux" + then "i686-unknown-linux-gnu" + else if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else if stdenv.system == "x86_64-darwin" + then "x86_64-apple-darwin" + else abort "no snapshot to boostrap for this platform (missing target triple"; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan ]; + license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; + # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + + name = "rust-${version}"; +} diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 2c27cf778a14..c2696bae922b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -14,23 +14,23 @@ */ -with if stdenv.system == "i686-linux" then { - platform = "linux-i386"; - snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea"; - target = "i686-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-linux" then { - platform = "linux-x86_64"; - snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae"; - target = "x86_64-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-darwin" then { - platform = "macos-x86_64"; - snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d"; -} else {}; -let snapshotDate = "2014-06-21"; +with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "84339ea0f796ae468ef86797ef4587274bec19ea" + else if stdenv.system == "x86_64-linux" + then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + else if stdenv.system == "x86_64-darwin" + then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-06-21"; snapshotRev = "db9af1d"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in -stdenv.mkDerivation { - name = "rust-0.11.0"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; src = fetchurl { url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; @@ -67,14 +67,4 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper ]; enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan ]; - license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; - # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; } - From 399f8b48f9935e18539cd3309c4eab3920ae22fa Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Jul 2014 06:04:38 +0200 Subject: [PATCH 111/286] rust: Prepare for more versions part 2: - Default is now an alias for 0.11 --- pkgs/development/compilers/rust/0.11.nix | 70 ++++++++++++++++++++ pkgs/development/compilers/rust/default.nix | 71 +-------------------- 2 files changed, 71 insertions(+), 70 deletions(-) create mode 100644 pkgs/development/compilers/rust/0.11.nix diff --git a/pkgs/development/compilers/rust/0.11.nix b/pkgs/development/compilers/rust/0.11.nix new file mode 100644 index 000000000000..c2696bae922b --- /dev/null +++ b/pkgs/development/compilers/rust/0.11.nix @@ -0,0 +1,70 @@ +{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: + +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +*/ + +with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "84339ea0f796ae468ef86797ef4587274bec19ea" + else if stdenv.system == "x86_64-linux" + then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + else if stdenv.system == "x86_64-darwin" + then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-06-21"; + snapshotRev = "db9af1d"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; + + src = fetchurl { + url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; + sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + snapshot = stdenv.mkDerivation { + name = "rust-stage0"; + src = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha1 = snapshot; + }; + dontStrip = true; + installPhase = '' + mkdir -p "$out" + cp -r bin "$out/bin" + '' + (if stdenv.isLinux then '' + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ + --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + "$out/bin/rustc" + '' else ""); + }; + + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + + # The compiler requires cc, so we patch the source to tell it where to find it + patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; + postPatch = '' + substituteInPlace src/librustc/back/link.rs \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + ''; + + buildInputs = [ which file perl curl python27 makeWrapper ]; + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index c2696bae922b..6a02145c8f02 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,70 +1 @@ -{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: - -/* Rust's build process has a few quirks : - -- It requires some patched in llvm that haven't landed upstream, so it - compiles its own llvm. This might change in the future, so at some - point we may be able to switch to nix's llvm. - -- The Rust compiler is written is Rust, so it requires a bootstrap - compiler, which is downloaded during the build. To make the build - pure, we download it ourself before and put it where it is - expected. Once the language is stable (1.0) , we might want to - switch it to use nix's packaged rust compiler. - -*/ - -with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); - -let snapshot = if stdenv.system == "i686-linux" - then "84339ea0f796ae468ef86797ef4587274bec19ea" - else if stdenv.system == "x86_64-linux" - then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" - else if stdenv.system == "x86_64-darwin" - then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" - else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-06-21"; - snapshotRev = "db9af1d"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; - -in stdenv.mkDerivation { - inherit name; - inherit version; - inherit meta; - - src = fetchurl { - url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; - sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi"; - }; - - # We need rust to build rust. If we don't provide it, configure will try to download it. - snapshot = stdenv.mkDerivation { - name = "rust-stage0"; - src = fetchurl { - url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; - sha1 = snapshot; - }; - dontStrip = true; - installPhase = '' - mkdir -p "$out" - cp -r bin "$out/bin" - '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ - --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ - "$out/bin/rustc" - '' else ""); - }; - - configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; - - # The compiler requires cc, so we patch the source to tell it where to find it - patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; - postPatch = '' - substituteInPlace src/librustc/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ - --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" - ''; - - buildInputs = [ which file perl curl python27 makeWrapper ]; - enableParallelBuilding = true; -} +import ./0.11.nix From be07584397386e78a36d37c3e5b3c01bd15913b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 30 Jul 2014 09:31:24 +0200 Subject: [PATCH 112/286] vlc: minor update --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 2c5b53c596a6..3c197d43a7db 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1lymhbb2bns73qivdaqanhggjjhyc9fwfgf5ikhng0a74msnqmiy"; + sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; }; buildInputs = From b9c457ba1225f4f83aa6a299fadbcd80a23e4562 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jul 2014 16:10:52 +0200 Subject: [PATCH 113/286] cacert: Update to 20140704 --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index ac5beaeee818..7bb1e1d21d59 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20131205"; + name = "cacert-20140704"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df"; + sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza"; }; unpackPhase = "true"; From 6479d6fea4e107019e3aa9f0606346260358f4a8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 10:23:05 +0200 Subject: [PATCH 114/286] Remove broken script --- maintainers/scripts/sort-attrs.str | 146 ----------------------------- 1 file changed, 146 deletions(-) delete mode 100644 maintainers/scripts/sort-attrs.str diff --git a/maintainers/scripts/sort-attrs.str b/maintainers/scripts/sort-attrs.str deleted file mode 100644 index b67b6ee2a57b..000000000000 --- a/maintainers/scripts/sort-attrs.str +++ /dev/null @@ -1,146 +0,0 @@ -/* Tool to sort attribute sets. Primarily useful for keeping - all-packages.nix tidy. - - To compile: - - $ strc -i ../../maintainers/scripts/sort-attrs.str -la stratego-lib - - Typical invocation: - - $ sglr -m -p ~/Dev/nix/src/libexpr/nix.tbl -i all-packages.nix \ - | implode-asfix --lex \ - | ../../maintainers/scripts/sort-attrs \ - | asfix-yield -*/ - -module sort-attrs - -imports - libstratego-lib - libstratego-sglr - - -strategies - - no-wsp = !appl(prod([], cf(opt(layout())), no-attrs()), []) - - -rules - - list-sep(s): [] -> [] - list-sep(s): [x | xs] -> [[x | before] | [split | after]] - where - xs => (before, split, after) - list-sep(s): [x | xs] -> [[x | xs]] - where - xs - - list-sep-end(s): xs -> [ (before, [split]) | after] - where - xs => (before, split, after) - list-sep-end(s): xs -> [xs] - where - xs - - - sort-attrs: - appl(p@prod(_, _, attrs([term(cons("Attrs"))])), - [ lit("{") - , ws1 - , appl(p2@list(cf(iter-star(sort("Bind")))), attrs) - , ws2 - , lit("}") - ] - ) -> - appl(p, [lit("{"), , appl(p2, attrs'), ws2, lit("}")]) - where - "found it"; - [ws1 | attrs] => withWSP; - withWSP => groups; - groups; - [x''' | xs'] - where - x => (x', starts); - [x' | xs] => [x'' | xs']; - <[] <+ \x -> ["\n\n\n" | x]\ > starts => starts'; - (starts', x'') => x''' - \ })> groups => attrs'; - "did it" - - - attach-wsp: [a, b | cs] -> [(a, b) | cs] - attach-wsp: [] -> [] - - -strategies - - starts-section = - ?x@(appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr); - cs; - !x - -rules - - - sortable-section = ?[s]; !s; explode-string; not(fetch({x: ?x; !(x, 97); geq})) - - - remove-section-start: - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr) -> - ((appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs'), attr), starts) - where - !cs; - list-sep-end(?10); // separate into lines, keeping the \n - map(implode-string); - partition(where(is-substring(!"###"))) => (starts, rest); - rest => cs' - - - regularise-empty-lines: - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr) -> - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs''), attr) - where - // separate into lines, keeping the \n - // last whitespace is significant, keep - cs => (init, last); - init => cs'; // remove whitespace-only lines - [ "\n\n", cs', last] => cs'' // add one empty line - - /* Dirty hack: *do* keep the first empty line following a non-empty line. !!! order matters */ - regularise-empty-lines': [] -> [] - - regularise-empty-lines': [x, y | xs] -> [x, y | xs] - where - x; - y - - regularise-empty-lines': [x | xs] -> [x | xs] - where x - - regularise-empty-lines': [x | xs] -> xs - where x - - - prepend-layout: - (text, (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr)) -> - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs''), attr) - where - cs => cs'; - ( text, cs') => cs'' - - - compare-attrs: - x@ - ( (_, appl(p1@prod(_, _, attrs([term(cons("Bind"))])), [id1 | xs1])) - , (_, appl(p2@prod(_, _, attrs([term(cons("Bind"))])), [id2 | xs2])) - ) - -> x - where - (id1, id2) - - -strategies - - main = io-wrap( - oncetd(sort-attrs) - ) From 9956b97b2f35a2cf87570e230abe0c5161d3944a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 10:28:05 +0200 Subject: [PATCH 115/286] Check for systemd environment variables that are too long Issue #3403. For the case of $PATH being too long, we could call buildEnv automatically. --- nixos/modules/system/boot/systemd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 14caa5d360d5..777c1ea74d88 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -317,7 +317,9 @@ let '' [Service] ${let env = cfg.globalEnvironment // def.environment; - in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)} + in concatMapStrings (n: + let s = "Environment=\"${n}=${getAttr n env}\"\n"; + in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} ${if def.reloadIfChanged then '' X-ReloadIfChanged=true '' else if !def.restartIfChanged then '' From cf744cb715ead592ff0b7ac2771a2d551d76b7f9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 30 Jul 2014 12:14:15 +0200 Subject: [PATCH 116/286] org: update from 8.2.7b to 8.2.7c --- pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index f55fe564ef3d..d5a7b0ded8a2 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -2,11 +2,11 @@ , texLiveAggregationFun }: stdenv.mkDerivation rec { - name = "org-8.2.7b"; + name = "org-8.2.7c"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "07hq2q126d967nj7xq46q4mkca5r2rw61bn8d6nzkhksghp8b2v1"; + sha256 = "0qqf58xqw1kkgjxm9z40s6h7xd209rx3933klla22lryv3yclc1k"; }; buildInputs = [ emacs ]; From b7c543136a427ec130c7dbb87fb90dc2107ccb46 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 10:49:31 +0200 Subject: [PATCH 117/286] Move CIFS support into a separate module --- nixos/modules/module-list.nix | 3 ++- nixos/modules/system/boot/stage-1.nix | 23 +------------------- nixos/modules/tasks/filesystems.nix | 2 +- nixos/modules/tasks/filesystems/cifs.nix | 25 ++++++++++++++++++++++ pkgs/os-specific/linux/busybox/default.nix | 6 +++++- 5 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 nixos/modules/tasks/filesystems/cifs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c444204c0b6a..ed93c1dd5709 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -316,11 +316,12 @@ ./system/upstart/upstart.nix ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix + ./tasks/filesystems.nix ./tasks/filesystems/btrfs.nix + ./tasks/filesystems/cifs.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix ./tasks/filesystems/nfs.nix - ./tasks/filesystems.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/vfat.nix diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 01558b8f9b28..327f11bc6987 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -23,22 +23,6 @@ let }; - needsCifsUtils = kernelPackages.kernel ? features - && kernelPackages.kernel.features ? needsCifsUtils - && kernelPackages.kernel.features.needsCifsUtils - && any (fs: fs.fsType == "cifs") fileSystems; - - busybox = - if needsCifsUtils - then pkgs.busybox.override { - extraConfig = '' - CONFIG_FEATURE_MOUNT_CIFS n - CONFIG_FEATURE_MOUNT_HELPERS y - ''; - } - else pkgs.busybox; - - # Some additional utilities needed in stage 1, like mount, lvm, fsck # etc. We don't want to bring in all of those packages, so we just # copy what we need. Instead of using statically linked binaries, @@ -62,7 +46,7 @@ let cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib # Copy BusyBox. - cp -rvd ${busybox}/{bin,sbin} $out/ + cp -rvd ${pkgs.busybox}/{bin,sbin} $out/ chmod -R u+w $out # Copy some utillinux stuff. @@ -91,11 +75,6 @@ let cp -v ${pkgs.kmod}/bin/kmod $out/bin/ ln -s kmod $out/bin/modprobe - # Maybe copy cifs utils - ${optionalString needsCifsUtils '' - cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin - ''} - ${config.boot.initrd.extraUtilsCommands} # Strip binaries further than normal. diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 4de16a776d42..4b189a801b2a 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -137,7 +137,7 @@ in system.fsPackages = [ pkgs.dosfstools ]; environment.systemPackages = - [ pkgs.ntfs3g pkgs.cifs_utils pkgs.fuse ] + [ pkgs.ntfs3g pkgs.fuse ] ++ config.system.fsPackages; environment.etc.fstab.text = diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix new file mode 100644 index 000000000000..c60f175db841 --- /dev/null +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "cifs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = { + + system.fsPackages = [ pkgs.cifs_utils ]; + + boot.initrd.availableKernelModules = mkIf inInitrd + [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd + '' + cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin + ''; + + }; +} diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 9e81508080df..98fedb2d3f4f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -28,6 +28,10 @@ let nixConfig = '' CONFIG_PREFIX "$out" CONFIG_INSTALL_NO_USR y + + # Use the external mount.cifs program. + CONFIG_FEATURE_MOUNT_CIFS n + CONFIG_FEATURE_MOUNT_HELPERS y ''; staticConfig = stdenv.lib.optionalString enableStatic '' @@ -49,8 +53,8 @@ stdenv.mkDerivation rec { ${configParser} cat << EOF | parseconfig ${staticConfig} - ${extraConfig} ${nixConfig} + ${extraConfig} $extraCrossConfig EOF make oldconfig From 95bbfc957f4058e9cfe4667a2ee413fbb283d440 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 12:39:01 +0200 Subject: [PATCH 118/286] erlang: Fix name attribute Versions should not start with a letter. --- pkgs/development/interpreters/erlang/R16.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index dd0fb3aec5f1..5945cdd8299d 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -8,10 +8,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "R16B03-1"; + version = "16B03-1"; src = fetchurl { - url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; + url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; }; in '' From b1ba1689bdad74210fd46a9715d6681ab48157fd Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sun, 27 Jul 2014 08:23:11 +0200 Subject: [PATCH 119/286] zed: build from source, ditch the installer, upgrade node-webkit --- pkgs/applications/editors/zed/default.nix | 72 +- pkgs/applications/editors/zed/node.nix | 634 ++++++++++++++++++ .../development/tools/node-webkit/default.nix | 6 +- 3 files changed, 687 insertions(+), 25 deletions(-) create mode 100644 pkgs/applications/editors/zed/node.nix diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 61abec29b47d..585a3a58d5f0 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -1,8 +1,10 @@ -{ stdenv, buildEnv, fetchurl, xlibs, glib, gtk2, atk, pango, gdk_pixbuf, +{ stdenv, buildEnv, fetchgit, xlibs, glib, gtk2, atk, pango, gdk_pixbuf, cairo, freetype, fontconfig, nss, nspr, gnome, alsaLib, expat, dbus, udev, - makeWrapper, writeScript, gnused }: + makeWrapper, writeScript, fetchurl, zip, pkgs, node_webkit }: let + name = "zed-${version}"; + version = "0.12"; rpath_env = buildEnv { name = "rpath_env"; @@ -13,25 +15,50 @@ let pathsToLink = [ "/lib" "/lib64" ]; }; - name = "zed-${version}"; - version = "0.12.0"; + # When upgrading node.nix / node packages: + # fetch package.json from Zed's repository + # run `npm2nix package.json node.nix` + # and replace node.nix with new one + nodePackages = import ../../../../pkgs/top-level/node-packages.nix { + inherit pkgs; + inherit (pkgs) stdenv nodejs fetchurl fetchgit; + neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux; + self = nodePackages; + generated = ./node.nix; + }; + + node_env = buildEnv { + name = "node_env"; + paths = [ nodePackages.tar nodePackages.request ]; + pathsToLink = [ "/lib" ]; + }; zed = stdenv.mkDerivation rec { inherit name version; - src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://download.zedapp.org/zed-linux32-v${version}.tar.gz"; - sha256 = "04cygfhaynlpl8jrf2r55qk5zz1ipad8l9m8q81lfly2q0h9fbxi"; - } else fetchurl { - url = "http://download.zedapp.org/zed-linux64-v${version}.tar.gz"; - sha256 = "0ng2v07fyglpbyl4pwm2bn5rbldw51kliw8rakbpcdia891hi6z1"; - }; + src = fetchgit { + url = "git://github.com/zedapp/zed"; + rev = "refs/tags/v${version}"; + sha256 = "1l1adj4p916km626vxg1lv0bapzay4z5nq005pxsbjbcycrhds59"; + }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper zip ]; + + dontBuild = true; installPhase = '' + export NWPATH="${node_webkit}/share/node-webkit"; + mkdir -p $out/zed - cp ./* $out/zed + + cd ${src}/app; zip -r $out/zed/app.nw *; cd .. + + cat $NWPATH/nw $out/zed/app.nw > $out/zed/zed-bin + cp $NWPATH/nw.pak $out/zed/ + cp nw/zed-linux $out/zed/zed + chmod +x $out/zed/zed* + cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed + rm $out/zed/app.nw ''; postFixup = '' @@ -42,17 +69,18 @@ let ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 wrapProgram $out/zed/zed-bin \ - --prefix LD_LIBRARY_PATH : $out/lib + --prefix LD_LIBRARY_PATH : $out/lib \ + --prefix NODE_PATH : ${node_env}/lib/node_modules ''; }; - zed_installer = writeScript "zed-installer.sh" '' - mkdir -p ~/.zed - cp -rv ${zed}/zed/* ~/.zed - ${gnused}/bin/sed -ri 's/DIR\=\$\(dirname\ \$0\)/DIR\=\~\/\.zed/' ~/.zed/zed - - mkdir -p ~/bin - ln -sv ~/.zed/zed ~/bin/zed + zed_script = writeScript "zed.sh" '' + if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then + PROJECT=$1 + elif [ "" != "$1" ]; then + PROJECT=$(readlink -f $1) + fi + ${zed}/zed/zed-bin $PROJECT ''; in stdenv.mkDerivation rec { @@ -62,7 +90,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - ln -s ${zed_installer} $out/bin/zed-installer + ln -s ${zed_script} $out/bin/zed ''; meta = { diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix new file mode 100644 index 000000000000..b4a7cec4269c --- /dev/null +++ b/pkgs/applications/editors/zed/node.nix @@ -0,0 +1,634 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-asn1-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }) + ]; + buildInputs = + (self.nativeDeps."asn1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "asn1" ]; + }; + by-spec."assert-plus"."0.1.2" = + self.by-version."assert-plus"."0.1.2"; + by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-assert-plus-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + name = "assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + }) + ]; + buildInputs = + (self.nativeDeps."assert-plus" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "assert-plus" ]; + }; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.9.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-aws-sign2-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "node-block-stream-0.0.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + }) + ]; + buildInputs = + (self.nativeDeps."block-stream" or []); + deps = [ + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "block-stream" ]; + }; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-boom-0.4.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }) + ]; + buildInputs = + (self.nativeDeps."boom" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "boom" ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.5"; + by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-combined-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; + name = "combined-stream-0.0.5.tgz"; + sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + }) + ]; + buildInputs = + (self.nativeDeps."combined-stream" or []); + deps = [ + self.by-version."delayed-stream"."0.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combined-stream" ]; + }; + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cryptiles-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }) + ]; + buildInputs = + (self.nativeDeps."cryptiles" or []); + deps = [ + self.by-version."boom"."0.4.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cryptiles" ]; + }; + by-spec."ctype"."0.5.2" = + self.by-version."ctype"."0.5.2"; + by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ctype-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + name = "ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + }) + ]; + buildInputs = + (self.nativeDeps."ctype" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ctype" ]; + }; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-delayed-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }) + ]; + buildInputs = + (self.nativeDeps."delayed-stream" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "delayed-stream" ]; + }; + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.2"; + by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-forever-agent-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }) + ]; + buildInputs = + (self.nativeDeps."forever-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forever-agent" ]; + }; + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.4"; + by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = [ + self.by-version."combined-stream"."0.0.5" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.9.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.29"; + by-version."fstream"."0.1.29" = lib.makeOverridable self.buildNodePackage { + name = "node-fstream-0.1.29"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz"; + name = "fstream-0.1.29.tgz"; + sha1 = "34d04023ebc91a9df47bd31ab97e4704b4db413f"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream" or []); + deps = [ + self.by-version."graceful-fs"."3.0.2" + self.by-version."inherits"."2.0.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.2.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fstream" ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.2"; + by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-graceful-fs-3.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; + name = "graceful-fs-3.0.2.tgz"; + sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."hawk"."~1.0.0" = + self.by-version."hawk"."1.0.0"; + by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-hawk-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }) + ]; + buildInputs = + (self.nativeDeps."hawk" or []); + deps = [ + self.by-version."hoek"."0.9.1" + self.by-version."boom"."0.4.2" + self.by-version."cryptiles"."0.2.2" + self.by-version."sntp"."0.2.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hawk" ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-hoek-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }) + ]; + buildInputs = + (self.nativeDeps."hoek" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "hoek" ]; + }; + by-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.0"; + by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-http-signature-0.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + name = "http-signature-0.10.0.tgz"; + sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + }) + ]; + buildInputs = + (self.nativeDeps."http-signature" or []); + deps = [ + self.by-version."assert-plus"."0.1.2" + self.by-version."asn1"."0.1.11" + self.by-version."ctype"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-signature" ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inherits-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }) + ]; + buildInputs = + (self.nativeDeps."inherits" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "inherits" ]; + }; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-json-stringify-safe-5.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }) + ]; + buildInputs = + (self.nativeDeps."json-stringify-safe" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "json-stringify-safe" ]; + }; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-1.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.9" = + self.by-version."mime"."1.2.11"; + by-spec."mkdirp"."0.3" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "node-mkdirp-0.3.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-node-uuid-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-oauth-sign-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth-sign" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "oauth-sign" ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.0"; + by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"; + name = "punycode-1.3.0.tgz"; + sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; + by-spec."qs"."~0.6.0" = + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-0.6.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; + by-spec."request"."~2.34.0" = + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.12.1" + self.by-version."form-data"."0.1.4" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + "request" = self.by-version."request"."2.34.0"; + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }) + ]; + buildInputs = + (self.nativeDeps."rimraf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "rimraf" ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-sntp-0.2.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }) + ]; + buildInputs = + (self.nativeDeps."sntp" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sntp" ]; + }; + by-spec."tar"."~0.1.19" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "node-tar-0.1.20"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }) + ]; + buildInputs = + (self.nativeDeps."tar" or []); + deps = [ + self.by-version."block-stream"."0.0.7" + self.by-version."fstream"."0.1.29" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tar" ]; + }; + "tar" = self.by-version."tar"."0.1.20"; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."0.12.1"; + by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { + name = "node-tough-cookie-0.12.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; + name = "tough-cookie-0.12.1.tgz"; + sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = [ + self.by-version."punycode"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; + by-spec."tunnel-agent"."~0.3.0" = + self.by-version."tunnel-agent"."0.3.0"; + by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tunnel-agent-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }) + ]; + buildInputs = + (self.nativeDeps."tunnel-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tunnel-agent" ]; + }; +} diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix index be125801bd50..04ee29621730 100644 --- a/pkgs/development/tools/node-webkit/default.nix +++ b/pkgs/development/tools/node-webkit/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "node-webkit-${version}"; - version = "0.8.4"; + version = "0.9.2"; src = fetchurl { url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "91229edfb03349306c5ce101fdab2de55f7473cc7c36367e9611a0527d2ef591" else - "12axppynangh0q72swzqcmz2blncgm2dw9n489313ybnp2p42hnp"; + "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else + "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri"; }; patchPhase = '' From 94ce6ec866a51ff8e520a1acc592f4de04b5759c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 13:10:03 +0200 Subject: [PATCH 120/286] Print a sensible error message if no device is specified for a filesystem --- nixos/modules/tasks/filesystems.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 4b189a801b2a..d00f479754ff 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -146,7 +146,9 @@ in # Filesystems. ${flip concatMapStrings fileSystems (fs: - (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") + (if fs.device != null then fs.device + else if fs.label != null then "/dev/disk/by-label/${fs.label}" + else throw "No device specified for mount point ‘${fs.mountPoint}’.") + " " + fs.mountPoint + " " + fs.fsType + " " + fs.options From f94f659a31d694c395cdb65e2f1925a6092d55a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 13:15:29 +0200 Subject: [PATCH 121/286] Don't require a device for tmpfs filesystems --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 -- nixos/modules/tasks/filesystems.nix | 3 ++- nixos/tests/misc.nix | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 28c42d64f6fb..6250fac0f0bb 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -179,7 +179,6 @@ in fileSystems."/" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; }; @@ -201,7 +200,6 @@ in fileSystems."/nix/.rw-store" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; neededForBoot = true; }; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d00f479754ff..ccb6b6160151 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -9,7 +9,7 @@ let prioOption = prio: optionalString (prio !=null) " pri=${toString prio}"; - fileSystemOpts = { name, ... }: { + fileSystemOpts = { name, config, ... }: { options = { @@ -68,6 +68,7 @@ let config = { mountPoint = mkDefault name; + device = mkIf (config.fsType == "tmpfs") config.fsType; }; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index c03db6c43353..e1830d95b41f 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -12,8 +12,7 @@ import ./make-test.nix { services.nixosManual.enable = mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; fileSystems = mkVMOverride { "/tmp2" = - { device = "none"; - fsType = "tmpfs"; + { fsType = "tmpfs"; options = "mode=1777,noauto"; }; }; From 6a5b3656893e92b73fba13b1b26716fcce2ddb60 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 13:17:34 +0200 Subject: [PATCH 122/286] nixUnstable: Update to 1.8pre3711_45f9a91 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index c27f78b31235..8e60413413f9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3705_71a20d4"; + name = "nix-1.8pre3711_45f9a91"; src = fetchurl { - url = "http://hydra.nixos.org/build/12722887/download/5/${name}.tar.xz"; - sha256 = "832905be494280c8dcb377e389fb9c6c77993508bb457e11720ba2b53dd580ae"; + url = "http://hydra.nixos.org/build/12967850/download/5/${name}.tar.xz"; + sha256 = "826d2cc0f6a140b7b93bb31f4ef67cb04bda6423239c58d0e9c33d70434023eb"; }; nativeBuildInputs = [ perl pkgconfig ]; From b599deedb453317be1a6337392cf96e51faa36e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 14:30:25 +0200 Subject: [PATCH 123/286] makeTest: Pass nodes attribute This allows doing things like: nix-build nixos/tests/misc.nix -A nodes.machine.config.system.build.initialRamdisk --- nixos/lib/testing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 063b9bf6c7af..0e23fc5d187d 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -117,7 +117,7 @@ rec { report = releaseTools.gcovReport { coverageRuns = [ test ]; }; - in (if makeCoverageReport then report else test) // { inherit driver test; }; + in (if makeCoverageReport then report else test) // { inherit nodes driver test; }; runInMachine = From d45dcf348e451dd56c0c994a894f4c22b653fb71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 15:52:03 +0200 Subject: [PATCH 124/286] Really fix NixOS/nixos#287 --- nixos/modules/system/boot/stage-1.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 327f11bc6987..b51ca9f7a362 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -333,9 +333,7 @@ in # Prevent systemd from waiting for the /dev/root symlink. systemd.units."dev-root.device".text = ""; - boot.initrd.supportedFilesystems = - map (fs: fs.fsType) - (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); + boot.initrd.supportedFilesystems = map (fs: fs.fsType) fileSystems; }; } From e68b0c7f5f14b4bef23303ec0316bcce88f05300 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 15:44:47 +0200 Subject: [PATCH 125/286] Mount unionfs-fuse filesystems using the normal fileSystems option --- nixos/modules/installer/cd-dvd/iso-image.nix | 20 +++++----- nixos/modules/system/boot/stage-1-init.sh | 10 ++++- nixos/modules/system/boot/stage-1.nix | 8 ++-- nixos/modules/tasks/filesystems.nix | 2 +- .../tasks/filesystems/unionfs-fuse.nix | 13 ++++++- nixos/modules/virtualisation/qemu-vm.nix | 37 +++++++++---------- 6 files changed, 52 insertions(+), 38 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 6250fac0f0bb..d43fa2203818 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -191,6 +191,8 @@ in noCheck = true; }; + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. fileSystems."/nix/.ro-store" = { fsType = "squashfs"; device = "/iso/nix-store.squashfs"; @@ -204,18 +206,16 @@ in neededForBoot = true; }; + fileSystems."/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + }; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; boot.initrd.kernelModules = [ "loop" ]; - # In stage 1, mount a tmpfs on top of /nix/store (the squashfs - # image) to make this a live CD. - boot.initrd.postMountCommands = - '' - mkdir -p $targetRoot/nix/store - unionfs -o allow_other,cow,nonempty,chroot=$targetRoot,max_files=32768 /nix/.rw-store=RW:/nix/.ro-store=RO $targetRoot/nix/store - ''; - # Closures to be copied to the Nix store on the CD, namely the init # script and the top-level system configuration directory. isoImage.storeContents = @@ -311,8 +311,8 @@ in ''; # Add vfat support to the initrd to enable people to copy the - # contents of the CD to a bootable USB stick. Need unionfs-fuse for union mounts - boot.initrd.supportedFilesystems = [ "vfat" "unionfs-fuse" ]; + # contents of the CD to a bootable USB stick. + boot.initrd.supportedFilesystems = [ "vfat" ]; }; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7adb932aba7f..1b51c11e351a 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -4,7 +4,8 @@ targetRoot=/mnt-root console=tty1 export LD_LIBRARY_PATH=@extraUtils@/lib -export PATH=@extraUtils@/bin:@extraUtils@/sbin +export PATH=@extraUtils@/bin +ln -s @extraUtils@/bin /bin fail() { @@ -262,6 +263,13 @@ mountFS() { checkFS "$device" "$fsType" + # Create backing directories for unionfs-fuse. + if [ "$fsType" = unionfs-fuse ]; then + for i in $(IFS=:; echo ${options##*,dirs=}); do + mkdir -m 0700 -p /mnt-root"${i%=*}" + done + fi + echo "mounting $device on $mountPoint..." mkdir -p "/mnt-root$mountPoint" || true diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index b51ca9f7a362..58ff97671f3d 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -35,6 +35,7 @@ let } '' mkdir -p $out/bin $out/lib + ln -s $out/bin $out/sbin # Copy what we need from Glibc. cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib @@ -46,11 +47,10 @@ let cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib # Copy BusyBox. - cp -rvd ${pkgs.busybox}/{bin,sbin} $out/ - chmod -R u+w $out + cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/ # Copy some utillinux stuff. - cp -v ${pkgs.utillinux}/sbin/blkid $out/bin + cp -vf ${pkgs.utillinux}/sbin/blkid $out/bin cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib @@ -73,7 +73,7 @@ let # Copy modprobe. cp -v ${pkgs.kmod}/bin/kmod $out/bin/ - ln -s kmod $out/bin/modprobe + ln -sf kmod $out/bin/modprobe ${config.boot.initrd.extraUtilsCommands} diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ccb6b6160151..64a20034f3cc 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -68,7 +68,7 @@ let config = { mountPoint = mkDefault name; - device = mkIf (config.fsType == "tmpfs") config.fsType; + device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); }; }; diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index 5b7777180568..fe195e0db0b6 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -2,14 +2,21 @@ { config = lib.mkMerge [ + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { boot.initrd.kernelModules = [ "fuse" ]; - + boot.initrd.extraUtilsCommands = '' cp -v ${pkgs.fuse}/lib/libfuse* $out/lib + cp -v ${pkgs.fuse}/sbin/mount.fuse $out/bin cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin + substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \ + --replace '${pkgs.bash}/bin/bash' /bin/sh \ + --replace '${pkgs.fuse}/sbin' /bin \ + --replace '${pkgs.unionfs-fuse}/bin' /bin + chmod +x $out/bin/mount.unionfs-fuse ''; - + boot.initrd.postDeviceCommands = '' # Hacky!!! fuse hard-codes the path to mount mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin @@ -17,8 +24,10 @@ ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin ''; }) + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { system.fsPackages = [ pkgs.unionfs-fuse ]; }) + ]; } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index bccf6583e47d..17acd08f086c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -275,12 +275,10 @@ in boot.loader.grub.device = mkVMOverride "/dev/vda"; - boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse"; - boot.initrd.extraUtilsCommands = '' # We need mke2fs in the initrd. - cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin + cp -f ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin ''; boot.initrd.postDeviceCommands = @@ -303,20 +301,6 @@ in chmod 1777 $targetRoot/tmp mkdir -p $targetRoot/boot - ${optionalString cfg.writableStore '' - mkdir -p /unionfs-chroot/ro-store - mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store - - mkdir /unionfs-chroot/rw-store - ${if cfg.writableStoreUseTmpfs then '' - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store - '' else '' - mkdir $targetRoot/.nix-rw-store - mount --bind $targetRoot/.nix-rw-store /unionfs-chroot/rw-store - ''} - - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store - ''} ''; # After booting, register the closure of the paths in @@ -343,12 +327,13 @@ in # configuration, where the regular value for the `fileSystems' # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). - fileSystems = mkVMOverride + fileSystems = mkVMOverride ( { "/".device = "/dev/vda"; - "/nix/store" = + ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose"; + neededForBoot = true; }; "/tmp/xchg" = { device = "xchg"; @@ -362,6 +347,18 @@ in options = "trans=virtio,version=9p2000.L,msize=1048576"; neededForBoot = true; }; + } // optionalAttrs cfg.writableStore + { "/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + }; + } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) + { "/nix/.rw-store" = + { fsType = "tmpfs"; + options = "mode=0755"; + neededForBoot = true; + }; } // optionalAttrs cfg.useBootLoader { "/boot" = { device = "/dev/disk/by-label/boot"; @@ -369,7 +366,7 @@ in options = "ro"; noCheck = true; # fsck fails on a r/o filesystem }; - }; + }); swapDevices = mkVMOverride [ ]; boot.initrd.luks.devices = mkVMOverride []; From 5e96158234d93e624f179cf47e1e261670c1f901 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 15:57:02 +0200 Subject: [PATCH 126/286] Remove Subversion from the installation CD --- nixos/modules/profiles/base.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 562419b3facb..6f9e3002f299 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,6 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.subversion # for nixos-checkout pkgs.w3m # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs From 39a67503621307692c00ec91edf8cdd3b0c23da2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 16:07:09 +0200 Subject: [PATCH 127/286] Shut up a warning in stage 2 --- nixos/modules/system/boot/stage-2-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index eff2fb583bab..66b8243fbd20 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -29,7 +29,7 @@ setPath "@path@" # Normally, stage 1 mounts the root filesystem read/writable. # However, in some environments, stage 2 is executed directly, and the # root is read-only. So make it writable here. -mount -n -o remount,rw / +mount -n -o remount,rw none / # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a From 2f53665c08a1cc7b086be5e2da50b30650eaa2b7 Mon Sep 17 00:00:00 2001 From: "tv@shackspace.de" Date: Tue, 29 Jul 2014 22:29:16 +0200 Subject: [PATCH 128/286] sec: update to version 2.7.6 --- pkgs/tools/admin/sec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index af634e3fd56c..d8c60c0ec3c8 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,11 +1,11 @@ { fetchurl, perl, stdenv }: stdenv.mkDerivation rec { - name = "sec-2.7.5"; + name = "sec-2.7.6"; src = fetchurl { url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; - sha256 = "a21dcbb61aa99930f911b79e9412b875af12b08722a78295d210b896f23a0301"; + sha256 = "1lrssln55p3bmn3d2hl8c5l5ix32bn8065w1cgycwsf7r6fww51p"; }; buildInputs = [ perl ]; From 1cc6dc198466eb451beb2daa6314a345f1853dab Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 23 Jul 2014 23:48:00 +0900 Subject: [PATCH 129/286] firefox-bin: update to version 31.0 --- .../browsers/firefox-bin/default.nix | 356 +++++++++--------- 1 file changed, 179 insertions(+), 177 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index b8e3124f1858..969ced923b3d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -38,184 +38,186 @@ }: let - version = "30.0"; + version = "31.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "44d2fc9d491b6c001e35cff6e5f1c38c8561d24f8fe2dfb4d79365bcabe965ea"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "e9fb52a3b82a1434b7fa3bae606749819672c96ce8678c51f1fdbc68520e26bf"; } - { locale = "af"; arch = "linux-i686"; sha256 = "bfce74c891ea370ce4e0fe43d578c3c0050d2655fff7372806ed6be338b2c438"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "18408a9c3f3b8c4d9f8cfe067ac23ddcdd3d3a7a22892ba8d74de5679a064db6"; } - { locale = "an"; arch = "linux-i686"; sha256 = "601efbf7944408ba1ac35831eaa92c4910cd904bfadc32895ff8d756c70ae934"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "0ba4c272ebac9ecafe5dbfb7fbba1cd2790d126f5b1756ab9a323c94b644df0b"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "23ea3168aea75b044fa217b78b01a2dc8c9dd92171d726c4a78c23cffc474469"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "dae2c1634e17b8c3e276e4c758c4d4c3b1b0d6006adac8e420c13b6f09a6cf53"; } - { locale = "as"; arch = "linux-i686"; sha256 = "7d36bd4589556374822f2ab5dd102d557257b5e0b529d1c963f96e9ab6a08850"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "c13ccf3546bafcfeb41c33762e41af249306d4bcfd3ad7fc957db481372be0dc"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "853310674d7011956d760883af15b8e343250f8fc3acb3067e0f5a3d978c06ff"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b938081e8672ed5ae16c40c6300e585a26f54da278726f48b98f3ca3e065662"; } - { locale = "be"; arch = "linux-i686"; sha256 = "b9acce210f2adf188ba9a3d92774a846a263baa5e076bb9452b89ca5609d6ac8"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "dd2a33ee1ed8c848454b6e64a0c1527f193d070e4d867c4f13fa84f39c9bfecd"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "ee060cd395ef28bbad4be74aa42e2a51e7ad866183d139bffbcc7634dc94d738"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "11a5dd807083da8c3132d9d6518dc674642418eff1fccf68e451ac67b90f141a"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "339d286f7f8f469bb6f9f85a8b21a745ecc42717dc91c21c7db88822e9be661a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "fc3f06743a84a7684e43cd4efedb02a126dd119f6141da49c6120f1bbcdf9392"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "c585982368f258a8a728f782c37428311f0b6a6512231c077a439dd93645c3a2"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "00b9af4425050ec42b4a45a3c4a16700edcc66297331b601950fb81421ef8eb4"; } - { locale = "br"; arch = "linux-i686"; sha256 = "b86d944592f16f5f0e558106e3464248e3d686f45527a40fb64aaa79d9f73422"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "b894c12508f0b0a892154ea61fb2bb01947929041a63518f7c405ed976cc4d3f"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "f7da0fead608f63c4a5be92fed9e0109fbe7288948d15dde05e10bba80b47743"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "1cb090f9b16bcae95055377bc14a531697c480ad50e3a098dbd572770924d558"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "0b36330715f8909e1515c535a06f4e3fdd7660de11b3424b4ce88f336561935f"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "c6e9e545d09e589fd5fbfd2c6482a5ef366c470e294823b3ba05c5e728bca2c2"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "ff1ca239be0e99b923c63c5bbc425dd2989bc40dbdc82dd731d7173fd539406a"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "fe8472d6a4bf9fcda3caef51449fc3e20e1fbadbb772b330a012ffa7219afae3"; } - { locale = "csb"; arch = "linux-i686"; sha256 = "db1b7dbc7b0cd564a04b3a37827e8d77277cd7ba6a59403c45115d34e637f463"; } - { locale = "csb"; arch = "linux-x86_64"; sha256 = "023dd75e02f41a2ce9991fb40a8a46767f1a10da876a390035a084c5b97bd9d2"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "9a6ac60099b03bdeb71c1a7739dafeff4b1682ffc43997191196e1f590421afa"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "a5f2030fb08c0dd6dff95310209ed7c6ee613680dd500f00e30e26c547f9c249"; } - { locale = "da"; arch = "linux-i686"; sha256 = "99a893ac19b0ca28177c8957d7296e6deef9ddb36a6b5b17823cb1e6fc9ec683"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "69f29e795f203fe47e22daf1259c2ecfb39c362babefbbccb31405f4632f236b"; } - { locale = "de"; arch = "linux-i686"; sha256 = "925aac0800ce63a88fadc945da40b00ed6dde327637821518a372d7affb6e450"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "d86c5d2102a95ff5a6e580a1ca7af25c2f470211182ef70e988b29b195be6dd4"; } - { locale = "el"; arch = "linux-i686"; sha256 = "af07fac82dea32d33bd6bc440e2a645eb160d196cf0d4883b878d3d2c584f81a"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "fcc96c25422837f19f9ff6cde02c81c4a5a3b7c8e6809b90c8761519571db1f6"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "758f7bb669743d6067e416c26f43806b16ddd16511a6818373e70960cbbd7151"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d46ba3d642bf43fca46dfb29efb5d08a15f114eb9facc868e86c31f7c9c98014"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "4bca44a1ba94bf5616f7ea650e37cd3e5a719546def9e4a08ee88aedbc3a4db6"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "3303cc600153d0198dace9826b6883aa510d4e380aa985b092b1da67ad865625"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "13736870573863aab644bf2be2219fe4b5c6bde4bd79b84f22e12d39e7cda6e0"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "7e88fa9f355f6787d38e75d86d5b592a1a2cec208255f276887f53a12beb9e97"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "ae4446e223c0169dd0b56db58760fdb323a2bec8135e45c79d385d895b64cee8"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "202f61dd8e5506594ae70bbee9150d86c8037887f8345871dc5c1c9e498b1d66"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "8fb276ed26fd46fceb029fbade706cb6e55d2958f03400ec1290784c533888c4"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "78130525d30d7c592bb63d7cedf3ab5db804d457c4d127d90b93d94501ad7b3c"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "ef6bf393a681f4a08031eeda61bba3614ebfab222fed43f9f8b21cfa8eb3862e"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "e56224bca0ebfab9eedecafafd792e48cb67e3f8741c4d5a94c8f74f634cecf6"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "9e007e6aa0f8aa3d1fac5dc13e98f81c23e6ff1e574545c021f8f7feeff86ce2"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "d4ff94f46fd086300992a30a1c4a8aa97ad7164d6cd26e82b20b5d0680b38169"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "9db42a0557838b23ac4937adfec407804e624e679e9ffd6da739d17cdfbaab78"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "d42d619d6da78d0bbcb32b0a93a2eaa623eadb3a5af43e5b8b14400e6e969779"; } - { locale = "et"; arch = "linux-i686"; sha256 = "5947822f3f02bd4ba530ad978de1a9d237981e3abdf1598e44095c650794d1ff"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "7521a4db287bb928f50b64817f3631e96ea4cead81b1a84ab7c3b930b3450e86"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "44095e98e74205fa012a2c0c636de3fe9cfb79d5729abf15214c1e7734946014"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "2032dfbc82a9aca1a2f4cf67e6089400bf305d13906f048c5c9b906a7201a9fb"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "469b8008287c93e152e762e82fb61644384c1e2631a6c45033503652daed09b1"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "61ea0d8941d22083f918d014d56a613788d1f4f549e5a62d50a1f9071439a36f"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "81a0083e5e4136e3ab3e6db0e2adcedfae7572722655a9cb8b9ca388c6057342"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "0efe16da918288754a3af816d72448a73690eb71b110cf3ff0586ee7505b9735"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "a0ee069e7c3100b921aab7c54c5d32741df4e058f52cb7f42acb2643bd534b30"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "55c84d504603d648e7d72a2fb8badb0bc9148cb376bb0cc6054f091867cb2613"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "9c9abea13db23ef5ef8c9a3ccb5a0702b44a8db2402f43f01a478eb61e7ddf34"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "ce26fc67cbc2031880ffa3529a59ca4122016258ab1c023e23247c26308b6a3e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "4a734880ed65a207d98630647a341644df4f68149c50ce5e683bb21b5c27f2c6"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "bace955c686456d7894ca7bc1cf854eb158d6183050318efc73768e232c9a413"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4801f40ebd820b8f229cfcd04a04351fcee9f78268af1c9863089ef6c64d736a"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c417c0182e6f706473bc4b7cf8c14aec96f96e21c17b8593b71ff38c97f7e9d2"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "15a9d316d472d2918eff0c6f02600e40a8f62d7ef53ab14c57537fdda0b5257a"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "8fcdcf093148222865a905586774dae5d805ef22c01afadeaabe3f0c7b315dba"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "83b0ccfe7cf7166899d17b2c9b1ea8effda9cf02024698f8db8f943a388bb3dc"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "550026595e6e59405b5869183af056ba5a60a303270f1a176ef25e3db1c70289"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "7e7dc86fa805808931ba57455b99c9273a4b0aa60998affce3c4b06f0ae7fc70"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "e0f35d7fe7875785e3749131cf86c5cbea5cbd7b3abd2c2c69f5f8376d3e53d7"; } - { locale = "he"; arch = "linux-i686"; sha256 = "5c200c8da3209c2120a8576c30ab609331b52807d0640daaa1a70f665c776969"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "6923a64d1ac5453453f148d38f116faca41be5b1d0a13d4f128bb73db67cb8e2"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "6a7e5d06169d6dd87e505012604c93a28440156a3f81e6fe24d567f9c2b2a919"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "56801593b9dd5ecefed8d7eaf438879dd23006ffff9a31c543861259dedf8263"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "4573cd0269639d122496bcaf842d8c741f4d54e8f57d0690b97d8e7e86ee7e74"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "753984384829229601fbe55d0b6615f3432fdf9babe908fb642f6ac79c749727"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "c330478e6e77eff117bce58e17661b83a30308f0a680f648fbf06d1c00f3883c"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "9d118ba236aa7a9b517278c375aa4e4fa65f85c71b8bea9c41702f6ae7b815cb"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "48c1691073b6ede77f5c5d5ae07af7372f17b9f52fd92950c2cca0a01b3b340e"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "beda26cefeeeeee59ea52fdd28e1e3025ca4cc3124541fc6825100a61eb398d8"; } - { locale = "id"; arch = "linux-i686"; sha256 = "8cf6d0bc2d4bcc68a5ddc935c3bd6ed19a63284dc3227e849be729645a6171d4"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "8be5900b83840871ffb6faba08fea9b35f9f396cae08b228c68e333719fb819f"; } - { locale = "is"; arch = "linux-i686"; sha256 = "7c167389105063b84d507b09c689fa18bf854fd695010c8273b9711b21a24034"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "c79321c83c9e654f6eaf96ddf5d24f279d517fbf35dfdf923acf026124919598"; } - { locale = "it"; arch = "linux-i686"; sha256 = "a3eb17e0eda3cbf8ffbbd1ecd1716929ac87a801f060dd8ed5291298667775a9"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "3742453f0748911b393fed804e5827f014cc595a9df4516438dfa163d5050411"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "fa030c64e04766ae5200370586c08b2f25627343586cd8a0486e583f345c466e"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "fddeae03ffdfef0f6cc999807e001ea931c15b1833da48655bcb5845f1e017a3"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "39d94b10fa751faf7423e5d43cd07ef4485ff26e21e47d106d2268058e2f33d9"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "1dc7138dd5c08088479c5e7e8054d7ed640504860a0043ecea2c8b0c9c1892f9"; } - { locale = "km"; arch = "linux-i686"; sha256 = "0d12a305de4a63fc6c6394bd4044f44ca3626cbc41ca9ef1adad6d5041f6f1fd"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "7710091695dd100b7f33585fce58c54fec462a96540a7d791f1935088f21fadf"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "b039e6a1114522ccae10b89ab794a222966fbf0914513b3c14f05c082a78b922"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "cf82965b25d3990a57d861d688f1bd69e5b069fe281937274060ebe36ddbb8a6"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "8b9378d39d7b42852c2bb537b0e85312760c343e6485826ed949ab4617293025"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "4b946a0cbedad2b8d0c3598c04eeb058cea05d6d7e6388e4cfa3146a40f7c449"; } - { locale = "ku"; arch = "linux-i686"; sha256 = "11950c4a54c6a165e924fb6e68bcc46d63b5fddfcd2561c58a0ce401c0146d36"; } - { locale = "ku"; arch = "linux-x86_64"; sha256 = "37a07a4e059580c31433b419bcd61d928ad1db7e607cf8443378472d54b61b78"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "c0efca49f31800a3773b0d05add56b195d1cbea287108803bb1ef5249a0dc94f"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "6e4b2d8c5e9942bc469f722110ba310b2ccdc4dda6e3baee93ae54012ae658a2"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "acde9010aa815f6645868b03f3d68d9a24c450ed830f063e2846ac1219ee628b"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "c2491cd3e5d11c302d7ec3191d646e2073c46f69966fc382901a93d16fb0c902"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "7411de62c4d8c01c8bb15b3f2dfc2e2ed17755e2f9856ead8e5e0fd05971ffd5"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "e8e57e629396eb180e0041a50ae98ecb2292f514d423423748e4d4cebc54fb59"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "26a053e48f4e6f04e4856a0dcb26e577a6ddb99afc883786d9c260d57e5e4a6d"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "86be2c736aa5ccf926d44f24afdb2d40c28444b5bd6cf090f9a847199b38b492"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "dcf7759bcde70158298ad9e2434e37d4e8240e00589a83dd8dbba53c35466a58"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "056297d6404794a8da78aeceb620b0ebbcb38a693ee1079cc02e4d0411e40ec3"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "2d632b3a5b60f18955906adca80b7ac7af3bfa39d03afd308efd1136cfc8971d"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "b54a9d47cadeae4f92d22a362ca887a18a16ef64500149ac8eb9355dbbe5971b"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "e66b22488bf2c772fa6d29cf43f3e9c1aa2a1a867620a1144af8cb92c2647651"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "da982205e9b659dd66ab05ca815324642bed2117e668e67ad620bb2d87c5d1c8"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "ad39ffa6d6d765c1e983d885f5d139a28e481d536068d517b4807137fa8d3036"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "fb1b6ed5e2e7247beb69f3d0ad937f76ce7c1107ccdad742ff5085d4b3a8da98"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5220da4627863f9fa1c11886e9c19c315547afafa96c98b22a1a4359c75f1056"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "5f9d60faadc7b76b010cd9cf35922b1881377b535e8afc5d9b974651156df866"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "357b28841ea861b8297a4986460d1d265b27202c37bb296dcc69224f9b07fc51"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "9a8505da2fe045ab6c2a2277d2d043374a26f106a5966b00f42e22fb26cf929a"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "f115bb50d1e052584caf7363db875ae222ee37449fa151e2f313c157a6274d76"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "2e7829a8a20c946bddce13b7b3d1b3600f90d90d2438f3eb69188d47203b264d"; } - { locale = "or"; arch = "linux-i686"; sha256 = "9ad48bdf2b7f1deedb05bdcc49740d5075ebf6ec228d82a7ed455c6bb36d7cb0"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "a007bc73fb1ea7765016e9faebac2c4f5e0111a45b3d75d1e55f4de8931796a2"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "8a38d2b1516ed4b58e36d266cd25a5bd10548f9e412076c9b4f1f27256c98c2a"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "664fa562261532d0f6bad10b84e15d47b69073768c2d12986c8d776eb1af8ddd"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "3bb8963f1e3dcdb22cc55feebb2583fefd6f3760f4e6f2cc754174079d4ca07f"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "710f1d86d2974d6ad3c63ebc0873518fd59f218ba07b27d06fb75c83af2c632e"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "cd2fafbd2291bad8481c4086db3c2973a7869b28a5e68a5ff199079814c6b3fc"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "f0ba5dc2366757841afb9c9f7799c40667304c36efe7da284202e8e7a45aa1fc"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "051af14810ad0cee4487757833f1f5b4a6f6f903f3cecf00d00410c1324d9ce4"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "82102b33dc1989bc3aa49da3915baf7e4012afe6e4bd7f80a301dfe847f3dbbe"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "02051668e46d98f4e2e5becc3192f6173dfdf3a48cc82264c5821be06c5e12a0"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "9600c1d272785b946058ffac9e57a8b1701d065f24fa940ad22e4b5aec2efad9"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "7f17cbd3041396135eee08eac597c8c6a936e5a33d67d2b5de8ae157a56719ad"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "ba1de85abe53a7d66f6311d6a202d91f86e871bace168cf60a759ab0e17eccdb"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "9dcd0c2b5671fc5849b01f2932504a7217fca9a4b4eca8e9b6ff8f5a146517e2"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "725214900968e4e648d3d13635bf72d34910eb31a30b83a3e7ba9c5c4085c2d7"; } - { locale = "si"; arch = "linux-i686"; sha256 = "d22ed75aa727351efcdba1cffe8e24ff305943c9a3072cac08b004677cf6a028"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "89d60c682413949a6dad4b7fd49cc4508c4e067fe5847c5f21d5e25a953f195f"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "4ecbc58df00eaf4fafb1c33a93493bdd3e544562a67c60e2d4d93da90d369261"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "75baa2c5153e282e2671d6222b7fc8c3b9cfc2b9ee0a595a4451fd314a928fb4"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "53e2ae3525d0bd2005a86bf7ed3f27ca66906ddfceb85a738bd60e46ba2df773"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "2dcc5592a49767dc3f2a7d40387bb550fd36724419ff567f9d107e32b2cf2d6d"; } - { locale = "son"; arch = "linux-i686"; sha256 = "d3b7372c59b21d0393768197517b3666ab78705b04a6e84a3345da031bad3776"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "fc017e7a18701880c7a54c23a0f77a6521aae17880dbc562e2b37167ba918fa0"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "7f9c9100c559ebfbfff35adc694199079930f4bf9f1f6a820c0e17d80ea0e12b"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "0f3fcddabab8263eb4c238942c45c0b5efc20c169948da24c56ed401a85209dc"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "6281e2f849b3c530ff383cfd4cdc4ab06115362c3d57ba8133a9f799af08e815"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "368ca83faa5ef3640f71d977916614369ebac1622681e828b75e9abf6ebeb425"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "9f77f497fc3e8c585bd546c0bb95c92f9f37d683e092c0762b3fe0022b6d39b5"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0aa21764f0ca58591e3cfebba75196edd51a8fdbadb738f036994178c9612a67"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "463ce70405d84945c201cca56c84171e097e6a0420d38cd453a0836fad82f09c"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "db7e78bc1f4bcb573474806d19324eca58f42008fb0b0fa856f701f1430aeefd"; } - { locale = "te"; arch = "linux-i686"; sha256 = "18643daf675f8ef9785a0039d012c3a8ce96f4d228426651c5f09c292cbfb335"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "d9f8a260fc47b608fd523c61e9c6981776997f4b7fc247e794be32d177abfbc0"; } - { locale = "th"; arch = "linux-i686"; sha256 = "e03b80d55d2a545ab3219c5e88ed6b7d6974945e32321a2fc96039a6996638f6"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "0416fd2b7e7ddde59a101fcba8258622a83b739effb327984fa8405e634c2121"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "75a49ce141c9a04254185b62af72c7e8c214e19e5257ff308b294aee6ac49a28"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "0845a554b299b848d35894144d3ba5c7e0b808bcc9b2732e904463258ca73cb7"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "a89f58c0f20a3ff7e609f572a4786f06b48886b7e2d303824417f42af49c8df2"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "b45768588aaf80917c8ad40d62835cc96c3dadf97715234e66542b96eeb8db8e"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "3fc35e59ecbbdf1b76b5b66e962a60eb724d9514d622879108725bcf7881fd1e"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "88116edeeecbfe1ac03af0da26aff84bc3aa5ba00574e899ec08e0d68243f509"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "a3afd3ac14049c72a9be28fb9a0849e4d3c5c2f13cb160c480988c4231679329"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "569587e9cc4cd99899d2939367d56f2e4e9ae333b583064a648f05a8b0b58e2c"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "358e44998142e56356b839a51dff97fe85e6293424bd0c148decf61f01b6125b"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "7b5a84dbbe361a775aaadad8fd328e24f6cf2e336297f1d5906f51ff5d3dfae7"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cf2cb9bed37dffe178a524ef5fe983e0e8b18f17c999e98474ae13e012da54da"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "aa0f1c5fb96dc4585e70fbcc291c6842be25e5d59be8bf39e8dc0232e9f1a76c"; } - { locale = "zu"; arch = "linux-i686"; sha256 = "775f6507ae8d6c2ef6e29e6b4d00453dcf9a0c9651eb9da482c78b5ebe64f2cd"; } - { locale = "zu"; arch = "linux-x86_64"; sha256 = "603510372a52497a8e41468dbc193afa25b0615f504f4548201deb89f27bd354"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "8372c1227b75486e297fd914bac530a45b22b789e627638e010d4c25337f350f"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "e01412aa570a462a3bb1ba851cd7133014b3299c0ad349c15534edc35c6d6397"; } + { locale = "af"; arch = "linux-i686"; sha256 = "e75bd2d41de60483ed1eadcf03d9cd57146210ff9fdfe04e984404ce4bca29f7"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "32697271215a0e63b7d0b25398d27772da5d53e88d020df24f170ebc341e5394"; } + { locale = "an"; arch = "linux-i686"; sha256 = "3a590702183a86283e4de415eefdeed6f95f1e5d48c64456c4d6db8f84dcfb68"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "98d35a6a2f0875a9723ed9511f3bea65f58da3196db3f75aaf7420d45bde33ad"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "e632f104442b725cf8e0e25c9a924b166289e1fab601a70aee0a81394632423c"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "603a054ceb36645881f52042e556572252e898bfa78cec04811e65f27b9db026"; } + { locale = "as"; arch = "linux-i686"; sha256 = "05e64b9113f450bfbfa1b99c9580dbb2442af35d6cc20dec0c7af379dd5d37db"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "85b57a101afd0c4aae040bb1f3523ddda3079d46ac8abe9cad826939fd274353"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "5df5eb0db623b42d9a2c9be58807ec66f43a26dd1365d44202d4b0db50d6a6f0"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "6faac3f3637bd68d6c20c73dd84c554afdaa136c4e142c26eb8142b7ab00895f"; } + { locale = "be"; arch = "linux-i686"; sha256 = "4a87051df26ddb3fd2cf7c2beabc2d403cbc4d2f2e7e0802fb11566722171b57"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "8194b851ed7f9559b78f63711df598ed094783eb2cc288fbd1e880d53118dde5"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "f6f903529d3276d1aa55968d4978fe5977d45076db0ee99d87199d59a9441ad5"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "bce34ee8ec314db0f7abfeddf491d15642dcedea125dc9bb7d7dda3915054940"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "9bd0e37ddf9a222263ca90308245e2078f45d754d8a2b0bc1e4dea13a5e7b581"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "debb3a9983e4219b6632cdfd09d04ab95314ba4e0bd7ff36fd89f0a748d25cdd"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea2c9d29f4a3dfe8e0f146979c47ccba835b81cb1f1ed6e95124a837918590fa"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "b2bf8e36ac1ca1afeae463bf95a289db7cf2d2fa303083ab405497cca2993b57"; } + { locale = "br"; arch = "linux-i686"; sha256 = "b4b9d2828e5387a65d0f63b2149400626cd47fc81b97b912eda11b3fe31d4604"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "c3af78f1215ffc1e9b6c193ba87d17e2f08e1a24856ee68aabf95b3ee7804ea9"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "7930f10d5d43e4504b9f347bcb2a2ef451be4418cee86c199b3e98c38587a20d"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "ee31279d2acf7286c9a59c99e68fdd1692b96247585230df20ea2bea5ee30ba2"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "f22f7964180ad27a122e56f070c6a2a0e3b044fe15ec5046b04db03877a3b7c7"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "84e8675f9613d1a8a49a760ee46d4625b88092cfc542e6b750384d0d5a0a465f"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "bed550a83c763a8147ef862cca7ca36106bfc5b34ea81f008c94886b86a3dde2"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "8bf76f388c6286a1b91cf460325b98c2dd08842031288617d9141b1368b5f62c"; } + { locale = "csb"; arch = "linux-i686"; sha256 = "2420bf49ff3429b3f186b17555b8b3250d44579b5ff7ce616914af646b5996be"; } + { locale = "csb"; arch = "linux-x86_64"; sha256 = "a0ee304a61b12ec1dd3caf5d876acbd9d2ad4443f9b96e73ecc1de8a1e16206f"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "603a66c237e95534d2dbd004e7fd77b69d5b99b73cba797c7825aaca6d849c61"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "69f68c024d6e9999b5a846d12c5a61ca63d962f6bd21737769d1fe5519916dad"; } + { locale = "da"; arch = "linux-i686"; sha256 = "da8ed391e8ae9729cf2af35700aff3f6900af208fee9eab6a6bd0fcb303abd09"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "7e3cc63eb61289e1006f683581345caaffe3ae39f7a636ff4f451b1e77a8ffb6"; } + { locale = "de"; arch = "linux-i686"; sha256 = "f191e74047cdddd43fa72242b1dce15a28160f62b4b8eae08ad117f4b27d6e0f"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "a81165d446cab525645ca2b18ef28cf253c6ee6267086d692a3904c79f7e5be0"; } + { locale = "el"; arch = "linux-i686"; sha256 = "eb0757aafd2a1c4bb9abeab01a3960d3ac21b92879f8dc7d24f485a43d305957"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "900f64bad286393f6d96f0ff00c6e78ae6cce998046cf506e2b3ec7a7b8e76c0"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "99284b229b7bfcc44cce3ebeee523e49bd5d9c7d860345ad3e242af4f9848683"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9a4e003441556422375d4bede21da27a03d31b5ec452ff467abcfffdfe363f4a"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "13b4297db52ef851b38f292eba2b2136e4c2f1453e004012fe8b1fbcf000abce"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "ce87f081c4867b9968a2695341001854aa6c1f4f19073d13f54f333cfed236fc"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "849584baf4c6dd330bf9c798e3e8923004a3a381642d4f684b5de3fb5b4fd895"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "635d0cb43a2b5f7f0401f961fd88fc0d6735223ad421ec0ef92a4ee16b29727f"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "91da9571212dc82f5d7140e4de073189018f7f895a3b263a4f8840401b4b10bb"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "77f39ab0168efe9070ecd881dbd2884fe5f35eeea17a63ad8d957398f6eef40d"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "f4ec6f07e67195981c12b5cbc3a6289a6e9d29539014c034039bd498a40f9301"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3f24135fd1a6fd2207bf1d80fc79cb34536b109e195e43a3a13eba0b68548c0e"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "de3672a512473cc6edc48bb775bc9a405d0c9effccdb0cd46af5ce2593d67613"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "770134c2bd8bc9f2e629e355b8e3b0949f67dd2ecd1b3a1d513bff364e53b734"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "4eeb5854427cde599468b90af70ae3e04eb9aff5132659f6e1ddb2f859f0be74"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "eb91e2e9b80cab85e6ab75e78a9b206a18bb647ffb247c0d5ed324ee219dccd9"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "0aa0c85a51a50adb9eca5e5a1eda0ca11ddc15ad12b2d930ebe769f10d535433"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "3f340072c80c95283b17e797bf4fdbde9d1de55b5f10f1c9e8193f8426c6157d"; } + { locale = "et"; arch = "linux-i686"; sha256 = "4719961e58e755ea2d9b94ff7439e1f9e858b0dacbd8631f98fadebca36c72a1"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "70aa1a76414c50b00fc85be87a07b936c7f60d83037f13716862e8491ec8d609"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "ea450d11b0cd3b4381797bf6ca48d74fb18d661864eccb365bc2d51b872b101a"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "d543e7fdd4c27875d30a1d527219e257296c6010e80dc0d5529722aa82cc666f"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "4b8aaf0d27f10474c6ec4eeec1418ffb08338475c5433199ac2db79aab5273b2"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "df10d71c7a762696ee682ca705052b15031dc7e84aa396f67fa26463e3dcd353"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "acdfec7656b48e5502692c408cd8c7543add80181130bdd2e0ec66ac44219a06"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "a9a0041cba2f80b09a2f22da6f1e9bfdfc1cbf0f5c324a427a1758174901fc27"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "304e90020134af5564d5c90c5d9fee6264aa871e82419408f5b0e9d97f8f8ff1"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "bfb86547ea4e0a5650a152070a7651a7f63b0df366fa4aed7f890033332e64a5"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "1ccef0f95df1571b9e378d97122303982f93251bd3ed70d0af93babc3459bad2"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "93ffcc3bbba8b7e0941fe674f6a67ed378e75b37c3e52debbef2434ea75f2b09"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "20ae7baa888fdcb467388313fa51104f8ba77ca31b2bcd731e2d65a46ff75c3f"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "33a028be0c63dc892efc93bd03375c8c4f9be38acb96a2bc516300c204086b3d"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "ddf134c692d321744bd787b7833ccc9b06ef130865c8f8ee816d35ff55c344a7"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "e76e18b18a7468ee6a550e837abf04b79833ae084210f723d0781f2b81e3077e"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "3c361e322be79ffaec9a382aacf3b9cc90f03fa664e35e283cd8572e66d3b8b0"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "5e95305321ff373d9cc6eee522dbd5ee948e6c298f2fb38d655965ec1de448e0"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "99b9dbf38f50f5385072d72d14684e980aead6125c4c91cfa8e69bd5c7f1aa0e"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "372bf1395f96be3b41d05630267354f7a6c0706e90f5e21320ab5ebd5d411d41"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "0b8429553052c8e23d3aaf1210d53b51fac2250d1d526311a22757ebd85ca54f"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "da6a7d7292965a0c1eaf58564d9bf85192719831208e8762d06c7082ee9824d7"; } + { locale = "he"; arch = "linux-i686"; sha256 = "78ac97da0515eb5a94455dcbf4cbd9a8d1ddbf03d4b8d29bad7b9e8fdbf5ef12"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "c0d853c639cfa7b14ce10ee50776f3aebf0c84807bb59d9ec6e0e20554ae8ed2"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "82376fe3005c56d2e895e1ffa0e9233f3885700117a73d1c49d67d742e324752"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "0ed6234fa9c5d449437d133c83f572ceca3dd82df6cbee8573c9f137c50bcf9c"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "10ff3539c27dc49763fe322e9540878d421bdf590d9a307fecc6c158472889c3"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "f97d7e3b290b0fc6a9116198da7fc7eb32895da74a3ad572d29577e14ab12f20"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "bba1a949823e70d1b5f4a0bec27437b6fc11638fa67b2ca286a833a0d44f5ef8"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5efaf3ec7f7b5d94df17d2fe0d5877a35442d33ccbf141fcf30e11351f9b4000"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "88a86463f2a47e38886cd2e8b470702623c772086b71d55e61de80e1c1be4fb3"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "967ff3bb62c8dbc93a25f75bec73803428b3fe5024841d3e2d97e444c1d27304"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4bac63a8b8fea36c3dab794dff933972f9adff7f91a7d3957d4edc3c60534016"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9c26a2438462429f96b2d8bb8c4566b1b1f7d03200ed68aaca4eb6602342c33c"; } + { locale = "id"; arch = "linux-i686"; sha256 = "e36cd7195d5cd21afd97f31a5108af5999ade8a97f92db3e00067f3cfc31cd72"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "191e47625a6764670bfbab673989e5b2e6ad45ad1c3a0544a129afe8cb963171"; } + { locale = "is"; arch = "linux-i686"; sha256 = "c839d21d4e16b05bd9aa995ff2124b6b8418ca1405a8f3bfc70fb65b5710488b"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "16d8df9867e6a13a2be7408f459e2c67d449a47105cf9709e4a743abed8229a9"; } + { locale = "it"; arch = "linux-i686"; sha256 = "7f9c3909cda97d9a40f2630af4f11e6dd8e29f45ab949348123c4334f6aee8fe"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "52f95491dbf4ee9a1f2ee552feb8a30b8196b6747064e45d5a98d0fecfa11f67"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "6586fd1d792feea4e98442736f06eab15d7de526667db6a3ce7de1afac9fdaec"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "0ef883bdf3d415a5795bd613af05b16a406b3af3415ac1c1ebc646dd76f76467"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "39167c7ee9f0e9b62308fcaba0f061bda0eaac9d3bb707c6556f71085c7ddd54"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "ec2c9ae1f5daba1e3b0c8a4f24737b0968bc818748b682418f02983e25302703"; } + { locale = "km"; arch = "linux-i686"; sha256 = "797747aa402ad42b6addd04d69995b0ea5c628da71f2cce15c8e612d15461189"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "fd75e5fbba75dd8a6cdafdb1c4983bfd4336f300df559518d3fff0e6e7e482d6"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "fada07e5679bcf174078e0c596cd121301f72c307401922e5772c6fa79eeedbe"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "d9cbb3dc02e3db54ea691dc09c882fcd65fd99bb1d0250e29e3d0a37df72179b"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "22bd8b1dec10117579a267d5bb9b10f460c27c9419305aa1cc4456b09fcd7df5"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "0e9da5e79ebb149a62606e002202b70908d329a26c213df35480962fb05a9f7c"; } + { locale = "ku"; arch = "linux-i686"; sha256 = "e5f55ab5112ca3a137c4df37460304ff7e33471e3e95e2709ace1cb32ef88084"; } + { locale = "ku"; arch = "linux-x86_64"; sha256 = "224385ae3a9da1fbbbc0d309eba0de6f64e29da4de29299cb1c778cb5a57c968"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "e39f5edc61e25f490dcae7ea4fdc91033f5e868cbcaf848180c40bd920455f17"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "f6e9725f368ce4df3be078a1ad268a29cfeba01e5606de85fbe2e375b3a5e263"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "46b2c694c60540ded3d3f6cb504bc5b7a709cc0940ff6b3223f05d7b8e1f7309"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "51d10f5c63e377b0f9e46d7ee12ea8552b8df57d6e8d9334555b7fbab617c8a4"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "8e224c3efcca9864255332b7f7c089c0c04b0eb2dfe60cd04d7dd6a61d807852"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "e53090be92e7557be5d38aed25ac0a2fb1006d15bb38d61141473f4b38c6e26c"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "479795f542d17476bb721d3e7c7fef565617528016085976a63b9e5864b4dd31"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "8daa2882e27a19894ded43885e868dd7203f506cb1bd25ede1d36328fffbbe0d"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "78f6fa53d5fda46fbe54b9978acaa75faaf094d2d3b8e464539609253da07c52"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "47a147a93dc7d1e683a57f0d7ddd7fbe3d944145932e0773be8dab6a7a0b4b01"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "6ac6a36596db8bf675df76abc629fc99ff019455f8c08842668a08cb40b67e9a"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "c4d4bed760c429c5db1d5c42682127794f81e20182aed0fc37f4c9aaf7bc582c"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "a2fc483f2aca2cbb7bdff42e4b27b711fdf27f46bee707d1c6d664c391c95def"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "5209926b3130b8b75d933287872af62ac752fc9e3fc170b540a2f0bc49d97bdf"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "926944ef9a3807b3379bba4b2fff05d8c2776cc4e3239b0b2bd2e5424151e6ee"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "20cf8557fa41119febc99bbc6de10ea7e97d3c1abc2245241db862ca8a735db1"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5a2778d9e93ae4371ad29737904aaecacf494855b45e5e79cfe773410f6600f6"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "8cfe4c778ee258dcd511990fd71eefcda46ab73c4448705e3815c5c371ee6ea1"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "350efbbaeb3ef9eee16a398ce482c2a3790f5b85dda6177857d7448de03af9e1"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "6d1310f7e2ebe5fc846f966bfa930a2bf3cd0877260de40b01496cb860630c37"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6447690e509ec0d1306bbfa484df82e62dd5909603b43440443c28bf2f489f24"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6e71ad4fe85b02f8745e6b3b39a6f69f13fff45fd555704747d1f59fcf64447a"; } + { locale = "or"; arch = "linux-i686"; sha256 = "71866d15af41df9d98716544d25d8fc2069a9a8f92cdd8180731e3b3fb3c3492"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "22ace7c20948526f1011e16581c870a919c4d8002bd0c3210ae8f702d1f8a03f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "12eabc66d39bd767c129c1a1777a6a13812efa0bc3df430dd7940908f53094ec"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "54501bca85e231e9fab0aa894a6e566966fdbd172fc45888d97eb828e248d105"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "e16acf44c5ab2ee708ba0f74301106a5fc0c36cd65ebd302043af09803f30138"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "a1532684d5d0e9e2091a5d42202dc6b49ee8c21df14600f0772e1f0f53f6d638"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9827bfda689b01e795d4ddf7ab1169e25cc1728175af74e8a08fa3e8ef40e40c"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "bfe02180011d564fe8deff4d3f3f8e3a6bfde05469738b5b2f8849a2ee485ba8"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "83fcda599d09946da8a968d903fa12b93502a23337f019d3217cc80f81607fe7"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "533050be56e6dbf06a5631a5b7a7db2da4f5514f224cb787600671c79c020379"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "62906af16b8e179be3015f6be9cf4b9481fcc506044c053373f9bc2e315729fa"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "f968ed9ba8ed43d0d52b02db23b2badf6e6a2544d105f23d6b09b80a07a28ee3"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "503fc4cf0de24ff5b1658d09264f8bb3b131c678f61c554ddf1006633ff2d336"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "514625ffbf4af4519a7671896f2f2797a1b17057dea356f7c17fa52a17736358"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "01521832ab38fd46751578691b82c0283d9c7a68459ab7225328afa285699b01"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "16b780ed767ff0537ec4619453d8cd3ebdcf124704d03d1741b5501007078dee"; } + { locale = "si"; arch = "linux-i686"; sha256 = "35ee6cded95ea13c8c480a46ffc9398f50d172aff2030611d6713b04ddc1c54d"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "c4ad9cec257bacffbcf3b4c84c63ec52e1ce830754b5be0b622a44ab223919ad"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "53a6bc5aebe5edf4bad34e163a54a3bed30a7c74ff883463caf057793ac3f58e"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "5110806bb3f02317b542bb79ce34c6bffeef68982807a5e53614958fb9adc779"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "3a58652b394fc2ffe1abcc1e89596f3e9357a2455cda8a0c76a44ff20331ada2"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "fb733f327080e5b4e2ae079a5cdbdb645fde1c9388368c13fcc6af4d3d91da7a"; } + { locale = "son"; arch = "linux-i686"; sha256 = "56a262e4411404e94747312858ae1e7ca99ea48171361f03cdc660f8b0da0da2"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "db77a5cab885f96efcbaae8e9f284ad30ab78aae1a405a5f1c2ac7d4d2e43498"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "fde7c85f09997ab3f7918072a9577f8d70947c5fafcc70782d684759146941bd"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "9865054be5d0a3913e4fa16aafdacd345607955b1d733d978033a2825d926c32"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "87f9f7d46a211b9205df5258f551b7c42264fdb81c70f836a37b3d5a821c4c03"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "ed03914c382efdec2f218e87e8efdd2b761e16ad0cc2a646b02050f27503161b"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1e28e39ac45177607a2ff3c71d3317b8b777679bc9e8dad2236991f05c6823ca"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "81c2fdc5ec9f338b1dc3cd5d2e8dd62cf106c4cf759826be8eb7f3f3f550c49e"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "8e27ba1c8079745a93bebf6f7e4dbfa9ffc32b91d6dfa12975497466f3ec1550"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "c244aeff11608d6f1a8513045ab53d4909af02915761b15ff34ddbbc9995dcbe"; } + { locale = "te"; arch = "linux-i686"; sha256 = "32e404eeeebeb521d909cc64fe1ba3c0b40130f7a4b4ae742a48ba61e8b668d4"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "83b5cefddc6308050c24d9fb30818fa1fb3c1d4ba9a2de9d8fc99878b01855b4"; } + { locale = "th"; arch = "linux-i686"; sha256 = "009cb39521635c1c89717b3d526a59c05e7ab82082ec31f0fd482800f01d3e8b"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "1fe31902ef44e7049e9efa4774098c00d3ecad0a4c4f585716cb4bec158e3b88"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "e54ee04479b9891420af6fc1d639da121b677660a5bf1dfd8565792c9e1cdbdf"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "bdfae1142a7714a0be9bd24b02582a9ab9913c17d130cf0b2928deb657f8bebc"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "b2d6b518e86c3bae1068f7a6d7cdc975f3b0f99e514c5d3d18dbe5e62d15dbce"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "71bd0518b69c911dbb21297cd676ed66231a3b7bc59090a9f6a85d6882263277"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "390fb219da7169d69a7aca1df883750d56bf34f0f7b6b49781d6f3c6b8962962"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "1c5af9f646ced5533223bca6dd36f364c0ca9d3f02ba93797aa8b091144cf7e2"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "5d0d04c7c84ffc51b11f99205ae767954b78d98c3a2d18bfcceca1cb292fcd9a"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "5fafe2b375ee0935da52ec9037c4f515d1be5cf783548215d289a300e06bb9de"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1361b7cfc08d4d000107a244ec2a163ab27616b1d1db13917f34acc4d4167d34"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "66aa04a7b5240df285afd37608c816b7c09cb365c6d0cd5aa4dbe8a7be61d824"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c0e3d9b584ba10e2a67a904253b2d93ab3546465e69619f932b566ad6b04a003"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "6a24f9f3631bc0bcc15de6a124c0f7dbcee6d0099e2f0b0622a18e54c04620a9"; } + { locale = "zu"; arch = "linux-i686"; sha256 = "7fa59f6ee26d48f992015b0bb667a0c230cea854eafa67d7c4e51d38e1a267d3"; } + { locale = "zu"; arch = "linux-x86_64"; sha256 = "4af969f1e0d0703e83d903fc2a30739ae2ab42cc3a24219be8bfd152490970c5"; } ]; arch = if stdenv.system == "i686-linux" From 63d259df32ab969c46aa839a77e8d86cb8f734cf Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 25 Jul 2014 14:05:57 -0400 Subject: [PATCH 130/286] nixos: tmp on tmpfs option /tmp cleaning is done by systemd rather than stage-2-init enableEmergencyMode moved from systemd to seperate module new option to mount tmp on tmpfs new option to enable additional units shipped with systemd --- nixos/modules/module-list.nix | 2 + nixos/modules/system/boot/emergency-mode.nix | 37 +++++++++++++++++++ nixos/modules/system/boot/stage-2-init.sh | 6 --- nixos/modules/system/boot/stage-2.nix | 14 +------ nixos/modules/system/boot/systemd.nix | 27 +++++--------- nixos/modules/system/boot/tmp.nix | 39 ++++++++++++++++++++ 6 files changed, 90 insertions(+), 35 deletions(-) create mode 100644 nixos/modules/system/boot/emergency-mode.nix create mode 100644 nixos/modules/system/boot/tmp.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ed93c1dd5709..2cbda50ba29d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -297,6 +297,7 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix + ./system/boot/emergency-mode.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix @@ -312,6 +313,7 @@ ./system/boot/stage-1.nix ./system/boot/stage-2.nix ./system/boot/systemd.nix + ./system/boot/tmp.nix ./system/etc/etc.nix ./system/upstart/upstart.nix ./tasks/cpu-freq.nix diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixos/modules/system/boot/emergency-mode.nix new file mode 100644 index 000000000000..9cdab8416192 --- /dev/null +++ b/nixos/modules/system/boot/emergency-mode.nix @@ -0,0 +1,37 @@ +{ config, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + systemd.enableEmergencyMode = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable emergency mode, which is an + sulogin shell started on the console if + mounting a filesystem fails. Since some machines (like EC2 + instances) have no console of any kind, emergency mode doesn't + make sense, and it's better to continue with the boot insofar + as possible. + ''; + }; + + }; + + ###### implementation + + config = { + + systemd.additionalUpstreamSystemUnits = optionals + config.systemd.enableEmergencyMode [ + "emergency.target" "emergency.service" + ]; + + }; + +} \ No newline at end of file diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 66b8243fbd20..bfc3c9b5da39 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -98,12 +98,6 @@ mkdir -m 0755 -p /etc/nixos rm -rf /var/run /var/lock rm -f /etc/{group,passwd,shadow}.lock -if test -n "@cleanTmpDir@"; then - echo -n "cleaning \`/tmp'..." - find /tmp -maxdepth 1 -mindepth 1 -print0 | xargs -0r rm -rf --one-file-system - echo " done" -fi - # Also get rid of temporary GC roots. rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index f53c3b8b8e70..6155bb37cc52 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -17,7 +17,7 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; isExecutable = true; - inherit (config.boot) devShmSize runSize cleanTmpDir; + inherit (config.boot) devShmSize runSize; inherit (config.nix) readOnlyStore; inherit (config.networking) useHostResolvConf; ttyGid = config.ids.gids.tty; @@ -26,8 +26,7 @@ let pkgs.utillinux pkgs.sysvtools pkgs.openresolv - ] ++ (optional config.boot.cleanTmpDir pkgs.findutils) - ++ optional config.nix.readOnlyStore readonlyMountpoint; + ] ++ optional config.nix.readOnlyStore readonlyMountpoint; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} @@ -81,15 +80,6 @@ in ''; }; - # FIXME: should replace this with something that uses systemd-tmpfiles. - cleanTmpDir = mkOption { - type = types.bool; - default = false; - description = '' - Whether to delete all files in /tmp during boot. - ''; - }; - }; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 777c1ea74d88..455c40693b00 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -162,10 +162,7 @@ let "systemd-sysctl.service" ] - ++ optionals cfg.enableEmergencyMode [ - "emergency.target" - "emergency.service" - ]; + ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = [ #"basic.target.wants" @@ -637,19 +634,6 @@ in ''; }; - systemd.enableEmergencyMode = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable emergency mode, which is an - sulogin shell started on the console if - mounting a filesystem fails. Since some machines (like EC2 - instances) have no console of any kind, emergency mode doesn't - make sense, and it's better to continue with the boot insofar - as possible. - ''; - }; - systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -692,6 +676,15 @@ in description = "Definition of systemd per-user socket units."; }; + systemd.additionalUpstreamSystemUnits = mkOption { + default = [ ]; + type = types.listOf types.str; + example = [ "debug-shell.service" "systemd-quotacheck.service" ]; + description = '' + Additional units shipped with systemd that shall be enabled. + ''; + }; + }; diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix new file mode 100644 index 000000000000..5bf5e2eb2ec5 --- /dev/null +++ b/nixos/modules/system/boot/tmp.nix @@ -0,0 +1,39 @@ +{ config, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + boot.cleanTmpDir = mkOption { + type = types.bool; + default = false; + description = '' + Whether to delete all files in /tmp during boot. + ''; + }; + + boot.tmpOnTmpfs = mkOption { + type = types.bool; + default = false; + description = '' + Whether to mount a tmpfs on /tmp during boot. + ''; + }; + + }; + + ###### implementation + + config = { + + systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount"; + + systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root"; + + }; + +} \ No newline at end of file From 4ed2acc1488cea18f24a7aceb0ef7365d270b140 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 16 Jul 2014 22:41:32 +0900 Subject: [PATCH 131/286] add source-han-sans-japanese, source-han-sans-korean, source-han-sans-simplified-chinese, source-han-sans-traditional-chinese: An open source Pan-CJK typeface --- pkgs/data/fonts/source-han-sans/base.nix | 26 +++++++++++++++++++ pkgs/data/fonts/source-han-sans/japanese.nix | 6 +++++ pkgs/data/fonts/source-han-sans/korean.nix | 6 +++++ .../source-han-sans/simplified-chinese.nix | 6 +++++ .../source-han-sans/traditional-chinese.nix | 6 +++++ pkgs/top-level/all-packages.nix | 5 ++++ 6 files changed, 55 insertions(+) create mode 100644 pkgs/data/fonts/source-han-sans/base.nix create mode 100644 pkgs/data/fonts/source-han-sans/japanese.nix create mode 100644 pkgs/data/fonts/source-han-sans/korean.nix create mode 100644 pkgs/data/fonts/source-han-sans/simplified-chinese.nix create mode 100644 pkgs/data/fonts/source-han-sans/traditional-chinese.nix diff --git a/pkgs/data/fonts/source-han-sans/base.nix b/pkgs/data/fonts/source-han-sans/base.nix new file mode 100644 index 000000000000..d319f41f2e52 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/base.nix @@ -0,0 +1,26 @@ +{version ? "1.000", prefix, url, sha256, description}: + +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + inherit version; + name = "${prefix}-${version}"; + + src = fetchurl { + inherit url sha256; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $( find . -name '*.otf' ) $out/share/fonts/truetype + ''; + + meta = { + inherit description; + + homepage = http://sourceforge.net/adobe/source-han-sans/; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/data/fonts/source-han-sans/japanese.nix b/pkgs/data/fonts/source-han-sans/japanese.nix new file mode 100644 index 000000000000..bfff019cef71 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/japanese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "SourceHanSansJP"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansJP-1.000.zip"; + sha256 = "c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82"; + description = "Japanese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/korean.nix b/pkgs/data/fonts/source-han-sans/korean.nix new file mode 100644 index 000000000000..99cab06e77ca --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/korean.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "SourceHanSansKR"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansKR-1.000.zip"; + sha256 = "8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8"; + description = "Korean subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix new file mode 100644 index 000000000000..a33762fbd52e --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "SourceHanSansCN"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansCN-1.000.zip"; + sha256 = "88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d"; + description = "Simplified Chinese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix new file mode 100644 index 000000000000..20ca507eef85 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "SourceHanSansTWHK"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansTWHK-1.000.zip"; + sha256 = "2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20"; + description = "Traditional Chinese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c4219a12741..e4933c8fcd5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8025,6 +8025,11 @@ let sourceCodePro = callPackage ../data/fonts/source-code-pro {}; + source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {}; + source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {}; + source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {}; + source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {}; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { From 74110a7a423a8f741485867900c66fba23f18d25 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 16 Jul 2014 23:02:03 +0900 Subject: [PATCH 132/286] source-han-sans: fixed package name --- pkgs/data/fonts/source-han-sans/japanese.nix | 2 +- pkgs/data/fonts/source-han-sans/korean.nix | 2 +- pkgs/data/fonts/source-han-sans/simplified-chinese.nix | 2 +- pkgs/data/fonts/source-han-sans/traditional-chinese.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/source-han-sans/japanese.nix b/pkgs/data/fonts/source-han-sans/japanese.nix index bfff019cef71..4aacdbf62e24 100644 --- a/pkgs/data/fonts/source-han-sans/japanese.nix +++ b/pkgs/data/fonts/source-han-sans/japanese.nix @@ -1,5 +1,5 @@ import ./base.nix { - prefix = "SourceHanSansJP"; + prefix = "source-han-sans-japanese"; url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansJP-1.000.zip"; sha256 = "c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82"; description = "Japanese subset of an open source Pan-CJK typeface"; diff --git a/pkgs/data/fonts/source-han-sans/korean.nix b/pkgs/data/fonts/source-han-sans/korean.nix index 99cab06e77ca..cf3ecd9e12e2 100644 --- a/pkgs/data/fonts/source-han-sans/korean.nix +++ b/pkgs/data/fonts/source-han-sans/korean.nix @@ -1,5 +1,5 @@ import ./base.nix { - prefix = "SourceHanSansKR"; + prefix = "source-han-sans-korean"; url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansKR-1.000.zip"; sha256 = "8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8"; description = "Korean subset of an open source Pan-CJK typeface"; diff --git a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix index a33762fbd52e..8e920455e453 100644 --- a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix +++ b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix @@ -1,5 +1,5 @@ import ./base.nix { - prefix = "SourceHanSansCN"; + prefix = "source-han-sans-simplified-chinese"; url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansCN-1.000.zip"; sha256 = "88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d"; description = "Simplified Chinese subset of an open source Pan-CJK typeface"; diff --git a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix index 20ca507eef85..b25db8a2515a 100644 --- a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix +++ b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix @@ -1,5 +1,5 @@ import ./base.nix { - prefix = "SourceHanSansTWHK"; + prefix = "source-han-sans-traditional-chinese"; url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansTWHK-1.000.zip"; sha256 = "2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20"; description = "Traditional Chinese subset of an open source Pan-CJK typeface"; From ea433053682d05819264eb0cdc97cc5e187a5e7d Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Wed, 30 Jul 2014 16:55:44 +0200 Subject: [PATCH 133/286] added cadaver: a command-line WebDAV client for Unix --- pkgs/tools/networking/cadaver/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/networking/cadaver/default.nix diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix new file mode 100644 index 000000000000..3fed3600b08a --- /dev/null +++ b/pkgs/tools/networking/cadaver/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cadaver-0.23.3"; + + src = fetchurl { + url = "http://www.webdav.org/cadaver/${name}.tar.gz"; + sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; + }; + + meta = with stdenv.lib; { + description = "A command-line WebDAV client for Unix"; + homepage = http://www.webdav.org/cadaver; + maintainers = with maintainers; [ ianwookim ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4933c8fcd5f..b01c474dda86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -719,6 +719,8 @@ let cabextract = callPackage ../tools/archivers/cabextract { }; + cadaver = callPackage ../tools/networking/cadaver { }; + cantata = callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; From e4e5502966636e1752005664c04baa06d13965a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jul 2014 18:13:51 +0200 Subject: [PATCH 134/286] postgresql: Update to 9.0.18, 9.1.14, 9.2.9, 9.3.5 --- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 00c614021b61..97e98217f8aa 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.17"; in +let version = "9.0.18"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad"; + sha256 = "7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 8d714c6f5a65..92417dc730c7 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.13"; in +let version = "9.1.14"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"; + sha256 = "d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 8b0ce0f7bb26..e5dbdd034d3f 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.8"; in +let version = "9.2.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c"; + sha256 = "94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 50ea799099c2..6c6ef132e813 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.4"; in +let version = "9.3.5"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"; + sha256 = "14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0"; }; buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; From b42aa6830ba034ae6ede772c367485984eab27e5 Mon Sep 17 00:00:00 2001 From: Sebastian Korten Date: Wed, 30 Jul 2014 20:26:29 +0200 Subject: [PATCH 135/286] scummvm: version bump to 1.7 --- pkgs/games/scummvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index ca72ac506d78..42fa98e372d1 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }: stdenv.mkDerivation rec { - name = "scummvm-1.6.0"; + name = "scummvm-1.7.0"; src = fetchurl { url = "mirror://sourceforge/scummvm/${name}.tar.bz2"; - sha256 = "1i3ywpq8csi58gdibdn51329vlj800l2laaw0lw18fcgdbd60q1r"; + sha256 = "d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66"; }; buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]; From a510e024b6d3540ba4d8764631a642a94b52ee54 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Jul 2014 00:12:16 +0200 Subject: [PATCH 136/286] rust: Add hashes for i686-darwin --- pkgs/development/compilers/rust/0.11.nix | 2 ++ pkgs/development/compilers/rust/common.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/rust/0.11.nix b/pkgs/development/compilers/rust/0.11.nix index c2696bae922b..1c3b09b0985a 100644 --- a/pkgs/development/compilers/rust/0.11.nix +++ b/pkgs/development/compilers/rust/0.11.nix @@ -20,6 +20,8 @@ let snapshot = if stdenv.system == "i686-linux" then "84339ea0f796ae468ef86797ef4587274bec19ea" else if stdenv.system == "x86_64-linux" then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + else if stdenv.system == "i686-darwin" + then "3f25b2680efbab16ad074477a19d49dcce475977" else if stdenv.system == "x86_64-darwin" then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" else abort "no-snapshot for platform ${stdenv.system}"; diff --git a/pkgs/development/compilers/rust/common.nix b/pkgs/development/compilers/rust/common.nix index 4ba6f159b4ce..b190b937dda2 100644 --- a/pkgs/development/compilers/rust/common.nix +++ b/pkgs/development/compilers/rust/common.nix @@ -7,6 +7,8 @@ then "linux-i386" else if stdenv.system == "x86_64-linux" then "linux-x86_64" + else if stdenv.system == "i686-darwin" + then "macos-i386" else if stdenv.system == "x86_64-darwin" then "macos-x86_64" else abort "no snapshot to boostrap for this platform (missing platform url suffix)"; @@ -15,6 +17,8 @@ then "i686-unknown-linux-gnu" else if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" + else if stdenv.system == "i686-darwin" + then "i686-apple-darwin" else if stdenv.system == "x86_64-darwin" then "x86_64-apple-darwin" else abort "no snapshot to boostrap for this platform (missing target triple"; From 2d31046a40e2ae5546971728477a0a1a17c49e08 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Thu, 31 Jul 2014 00:27:48 +0200 Subject: [PATCH 137/286] gtkpod: bump to 2.1.4 --- pkgs/applications/audio/gtkpod/default.nix | 33 ++++++++++++++----- pkgs/desktops/gnome-3/3.12/default.nix | 7 ++++ .../gnome-3/3.12/devtools/anjuta/default.nix | 21 ++++++++++++ .../gnome-3/3.12/devtools/gdl/default.nix | 17 ++++++++++ .../gnome-3/3.12/misc/libgda/default.nix | 23 +++++++++++++ .../libraries/libid3tag/default.nix | 29 ++++++++++++++-- 6 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 95a602312970..a13ad2402889 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,21 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser -, libglade, flex, libid3tag, libvorbis, intltool }: +{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, + gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag, + libvorbis, hicolor_icon_theme, gdk_pixbuf }: -stdenv.mkDerivation { - name = "gtkpod-1.0.0"; +let + gnome = gnome3_12; + +in stdenv.mkDerivation rec { + version = "2.1.4"; + name = "gtkpod-${version}"; src = fetchurl { - url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz; - sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q"; + url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa"; }; - buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex - libid3tag libvorbis intltool ]; + propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + + buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta + gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + hicolor_icon_theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; + preFixup = '' + wrapProgram "$out/bin/gtkpod" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + meta = { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 1bb197338ec2..b1d06d751871 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -215,6 +215,11 @@ rec { seahorse = callPackage ./apps/seahorse { }; +#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ + + anjuta = callPackage ./devtools/anjuta { }; + + gdl = callPackage ./devtools/gdl { }; #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ @@ -226,6 +231,8 @@ rec { gitg = callPackage ./misc/gitg { }; + libgda = callPackage ./misc/libgda { }; + libgit2-glib = callPackage ./misc/libgit2-glib { }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix new file mode 100644 index 000000000000..c372d5165381 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + itstool, python }: + +let + major = "3.13"; + minor = "1"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "anjuta-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; + sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview intltool itstool python ]; +} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix new file mode 100644 index 000000000000..d532125c03d2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }: + +let + major = "3.12"; + minor = "0"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "gdl-${version}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; + sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d"; + }; + + buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix new file mode 100644 index 000000000000..f0bdf01953c4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }: + +let + major = "5.2"; + minor = "2"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "libgda-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; + sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; + }; + + configureFlags = [ + "--enable-gi-system-install=no" + ]; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; +} diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index cb54f17755cd..a173cee2f264 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,7 +1,10 @@ -{stdenv, fetchurl, zlib, gperf}: +{stdenv, fetchurl, writeText, zlib, gperf}: + +stdenv.mkDerivation rec { + version = "0.15.1b"; + + name = "libid3tag-${version}"; -stdenv.mkDerivation { - name = "libid3tag-0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; @@ -11,6 +14,26 @@ stdenv.mkDerivation { patches = [ ./debian-patches.patch ]; + postInstall = let pkgconfigFile = writeText "id3tag.pc" '' + prefix=@out@ + exec_prefix=''${prefix} + libdir=''${exec_prefix}/lib + includedir=''${exec_prefix}/include + + Name: libid3tag + Description: ID3 tag manipulation library + Version: ${version} + + Libs: -L''${libdir} -lid3tag + Cflags: -I''${includedir} + ''; + in '' + ensureDir $out/share/pkgconfig + cp ${pkgconfigFile} $out/share/pkgconfig/id3tag.pc + substituteInPlace $out/share/pkgconfig/id3tag.pc \ + --subst-var-by out $out + ''; + meta = with stdenv.lib; { description = "ID3 tag manipulation library"; homepage = http://mad.sourceforge.net/; From 6a7d82d00004aa75512ab7268504f12c8b4f3124 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Thu, 31 Jul 2014 00:40:05 +0200 Subject: [PATCH 138/286] added meta information --- pkgs/applications/audio/gtkpod/default.nix | 7 ++++--- pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix | 7 +++++++ pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix | 7 +++++++ pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix | 7 +++++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index a13ad2402889..80a7cf52cd8d 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -33,10 +33,11 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; }; } diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix index c372d5165381..79bfd8952578 100644 --- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix @@ -18,4 +18,11 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl gnome3.libgda gnome3.gtksourceview intltool itstool python ]; + + meta = with stdenv.lib; { + description = "Software development studio"; + homepage = http://anjuta.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; } diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix index d532125c03d2..1dae33cd4e91 100644 --- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix @@ -14,4 +14,11 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + license = [ licenses.gpl2 ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix index f0bdf01953c4..3944644a4536 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix @@ -20,4 +20,11 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; + + meta = with stdenv.lib; { + description = "Database access library"; + homepage = http://www.gnome-db.org/; + license = [ licenses.lgpl2 licenses.gpl2 ]; + platforms = platforms.linux; + }; } From 11dc22e3eecaec79122b4a3446d892adb1ad9ad9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 30 Jul 2014 18:10:59 -0500 Subject: [PATCH 139/286] Agda needs an older version of haskell-equivalence --- .../libraries/haskell/equivalence/0.2.3.nix | 22 +++++++++++++++++++ .../equivalence/{default.nix => 0.2.5.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 ++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/equivalence/0.2.3.nix rename pkgs/development/libraries/haskell/equivalence/{default.nix => 0.2.5.nix} (100%) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix new file mode 100644 index 000000000000..934468212244 --- /dev/null +++ b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, QuickCheck, STMonadTrans, testFramework +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "equivalence"; + version = "0.2.3"; + sha256 = "0dd986y0sn89fparyz6kz9yhzysbqjcp8s99r81ihghg7s9yc743"; + buildDepends = [ mtl STMonadTrans ]; + testDepends = [ + mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://bitbucket.org/paba/equivalence/"; + description = "Maintaining an equivalence relation implemented as union-find using STT"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/0.2.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/equivalence/default.nix rename to pkgs/development/libraries/haskell/equivalence/0.2.5.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f564b447961b..3fb2cf834845 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -731,7 +731,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in entropy = callPackage ../development/libraries/haskell/entropy {}; - equivalence = callPackage ../development/libraries/haskell/equivalence {}; + equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; + equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; + equivalence = self.equivalence_0_2_5; erf = callPackage ../development/libraries/haskell/erf {}; @@ -2759,6 +2761,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix { binary = self.binary_0_7_2_1; QuickCheck = self.QuickCheck_2_7_5; + equivalence = self.equivalence_0_2_3; }; Agda = self.Agda_2_4_0_1; From 7d90959d73414ee1a157d634088d730e7f236b1c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 30 Jul 2014 18:11:18 -0500 Subject: [PATCH 140/286] idris: 0.9.14 -> 0.9.14.1 --- pkgs/development/compilers/idris/default.nix | 6 +++--- .../compilers/idris/trifecta-fix.patch | 15 --------------- pkgs/top-level/haskell-packages.nix | 4 ---- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/compilers/idris/trifecta-fix.patch diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index df57364fa085..48682210be1e 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -11,10 +11,11 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14"; - sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; + version = "0.9.14.1"; + sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; isLibrary = true; isExecutable = true; + jailbreak = true; buildDepends = [ annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree @@ -26,7 +27,6 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; - patches = [ ./trifecta-fix.patch ]; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/idris/trifecta-fix.patch b/pkgs/development/compilers/idris/trifecta-fix.patch deleted file mode 100644 index a20e482d2c41..000000000000 --- a/pkgs/development/compilers/idris/trifecta-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Idris/AbsSyntaxTree.hs b/src/Idris/AbsSyntaxTree.hs -index 76df969..076f1ff 100644 ---- a/src/Idris/AbsSyntaxTree.hs -+++ b/src/Idris/AbsSyntaxTree.hs -@@ -194,6 +194,10 @@ data IState = IState { - idris_callswho :: Maybe (M.Map Name [Name]) - } - -+-- Required for parsers library, and therefore trifecta -+instance Show IState where -+ show = const "{internal state}" -+ - data SizeChange = Smaller | Same | Bigger | Unknown - deriving (Show, Eq) - {-! diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3fb2cf834845..6a995a6dd598 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2875,10 +2875,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { - parsers = self.parsers_0_10_3; - trifecta = self.trifecta.override { - parsers = self.parsers_0_10_3; - }; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; From 5a329bbe23561d0ed69918457e90a90d4c572221 Mon Sep 17 00:00:00 2001 From: Bodil Stokke Date: Thu, 31 Jul 2014 03:00:14 +0100 Subject: [PATCH 141/286] thunderbird-bin: Update to version 31.0. --- .../mailreaders/thunderbird-bin/default.nix | 222 +++++++++--------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 13facc906901..15acd5af8dfd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -38,118 +38,118 @@ }: let - version = "24.6.0"; + version = "31.0"; sources = [ - { locale = "id"; arch = "linux-i686"; sha256 = "e19f6f5b8f19178350ec68386afd2ab7e5900b8c1fdb7bf81928fedcfcea5cbe"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "ece7445451150b2776f5debc818e288b9037dac1f2da9c7f7db584b6d2b73d34"; } - { locale = "he"; arch = "linux-i686"; sha256 = "0ff30ffc7ffe087056b0e72d66d2bc264c1060e3abb65e0c4d53d976855f436f"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "dd41d433644f7790ace1f246ec6703c060456260716710fc4318ca834ecd758b"; } - { locale = "el"; arch = "linux-i686"; sha256 = "eb6d53c00a6cd912279b56c5322d65b94fdd2a021c9ea2c854f664e476ae89e2"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "b0fdf2dc2de7ba5296f69694908aef4954b24b4c3092bddbec8995bf838bb817"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "71f4f7738540445dc64399368bb63bf48ede79f055d6647ba9ed4d274040d623"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "2be714b598bf8f1a3c6c9a13141d370c4d29bfec3e4053eb6f1c8a6a7988a96b"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "8b2c3b83f4f88e33ac31b07dfb64e83fd1b2cce9ad877c8bb5715a0e6299ce6f"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "93cd2c5c6c2ac05af3bb55a723bf3f02234d55064b5ea7cba6289bd07cca7647"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "2f11b85055fa21b4e2677b92fef34a769ed56bdbd877fefb86599edb5dd39932"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "d47057633c0ec5e785a723c45c5b8b0168e3d3fabe4aaedb4ca1adbff29a4dcd"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "902274548b7308e75c465f71912a7d1e5539e92420ffa17c80a2ac20d02d8630"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "044494d6bfc07b9cbeaa325dab3c1f0c5e554a05f1a050d960c39fbe093d9482"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "e453a06a64c35ed81e661c67fbd4241a7c5494b1f3d2bf5ace7543798feb338c"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "e8006f0e89153424c809de41ec1a714b91011b5a2a9601c1893a6ff30dcbd2ac"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "fed414783f8e9bba5be6d4cb90ef04f274aabab34f3b4351a329d5c5ae7ae8f0"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "e8f0203bf90bc30c89380c417921139f7b92ef1d38b3d95d292acee3be4e93c3"; } - { locale = "br"; arch = "linux-i686"; sha256 = "0948d002df401b9aaedbf8e3277ce312edeb635baa57b1bdf5de87cc13dd36cb"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "733e09671f00c693e13a726fa597b4705822e693ddce8a0494c57fde1de3cb56"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "c160c17e4b9b0e3d579a01b5973d142c711d4f87b03fd542d073d816ced9a9c9"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0c281e6430a233aca5c6130e907e08c7d05aed8851214063546aff5a5df82232"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "5d85eb78f01e1d52e733d4abf8d33281ec2c4adf9a9c65f50c6d6e2b6acf3d1d"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "a7bb71bb08ccfc01f8e91b47b6ee0ac4592976e964454304da493e0582d262d1"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "a63e060eac9efb27b4166e05ff6a035afd51cd29d45ddf69e5226e08441ac53c"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "8a5f45352e180e984c7f1bc37f0e7602cbc6085a3dcdcac2d74f493941fd9f0e"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "ef70e1ff3ff3ce2fd9ecbe62ed010c06e63b410b843cdc3aa3c93fda2bf56708"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "af33cba52556057abf17df0e92c11ecbf39382bbf92c66b137113e5503ae170b"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "f87eac6641ebccf018c76275adcba03976b9c62b9fa51533ec67ab0d2a5a91b9"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "009b53f10bd785a799026dab028fbb7fa46c154569eba98db2673af12f6c19c4"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ae2243346546cc2c768a9c24fc296013a45459637ab65477537f9d08d5ae193c"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "5cb2af1ec854e12b91bdf7f2fe88b56bfb45bf7144cf5cc3f0e307259d767a43"; } - { locale = "is"; arch = "linux-i686"; sha256 = "bf3a2e4efd86b1e73ac38ef3dc880ce2cee3102d2844b17ebf31aa6528040a92"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "d36f8d321d2952310dcb19a288f36f6496ca24e7f49fb483882c270c1c96571d"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "e05f63d1f978029169a91719551b6e399be0e0d37310921168904d188e41f50d"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "b8025a7a724a0d98c4f706e7ce59aae8c0f7bcd0082733ce6bee73a1d243feef"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "26ded9a3ebea58bcf80ca47759d4fdb86fe91aea8dcf56afdbaf7a32d548ee66"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "fd8321d5d6adaae042651d911df6ef587afda19ee82bdcfce98814144282b54d"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "94b94517072901f34ab28b6cf3a2fd8852867f147ab4b47f34f7d9ae16fbd603"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "e38f493ea1b8c0b183bad2f2627eb166e75e875a62b33704f50f8f831fd552ec"; } - { locale = "si"; arch = "linux-i686"; sha256 = "319ae8256ecf3d7623195e474040fffffff230cd612571872a38b52b608c0507"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "f776b8a9efad41f5c2f8770452a0bd053a3ba9ed4b74da3e3f24214c69e9779e"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "f6aea954d3ba2334411a7ce9e7e1da926b0039935c5db3a5480f0fbda583b849"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "9fef811764441b2b16e408808f4608e17cd21175cf45774162b3bce8b8612491"; } - { locale = "it"; arch = "linux-i686"; sha256 = "71df4de89a1eff632339dbaf48ce41182f7a20f7e55a223f6816ef86d3465443"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "076332c97a5c854b2313bd9f2138a6660d8e04fbddc3f8beb89acf071efd4c86"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "1a45f7d1d8817f6c724dff556886edc3f2d0ee62ff45bea8d6b7ef63f7f92928"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "8aa25320126052c9ebc3496e8731224e30fbd45ee2679f4d87f7f2050a01c312"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "83a31a94eeb95e28612eeb1e696ed387b6793da350efda439de11833e0ea1173"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "8c1647f8bfb210f7da8aa164777ef412bf3d4459ce53c95ee2211b4b5df440dc"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "e5bb99de119fd6496674fb9cc8432f146e684afc652dec2861108d1ef20b49d7"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "f35e62031154a32da68ea3d6960da8807f0de7ade7071526fafd6ace48c88976"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "0826595dddc981b64d4f1a59cd71411c34ccd0aeac182925709abeedff8461fc"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "b5b8d30251fc482861518e1c86001aa5eca6b53a65e14a8c6ff9e61eaf651044"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "a9b2138cacc983142353ec09a5c4226fc731501da4c0200cc86026e6b28ca10c"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "6c9a2ce8a8d3b4815475827caf89a3fee8371c422aa6c4984bb03f56728b682c"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "813260cf5ab06e55c563e015e0172ce0192ccdd894a352ef6d4f439252032619"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c879fe62db6952f91c51ec7c172bc67d5351f55e99ab6df5cdd8639206f3444a"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "33888c19b7e5e57155748d7372ad2b0e61f522ee96913f8846c754c3361fcb4a"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "d5487588cf07cbd2b02b1c566b6515d087cf8fe9d528890b1dd5a0de53ab1d8c"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "72b3a36269de70bd627589bad817e7702a4c83fff9b460e4f787486fa4bf15c7"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "d458ed4b62f65ce7c3787930549cbee42842ae87a846e5d1565c1881b3bc17e8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3155a71e847020b2806f6b31acbaa702ccf20f8bd805c2aedb0c9c415f75b88f"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "b56beb864d247685cd9ba6820e5a8a143be28ff95440e38670c8963d2c769738"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "74b7059580a4f389278b1059d80308101ffcfd0a738c6d614e56560ce116db34"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "a351421c230f6629de0125a30767ff10d541264f6249f6fa2568eae76189398f"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "d26ba336a555276c36f9a003df9bc3e0df1c40dd4da7062d1cd8b3a6cba6d52c"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "078e5878f823b2d19568af8bda095e6ab46097a680b209bae9242d7658377abf"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "c9aaab25dabdba0708459a82882b926155b475314d72463633af10c27d9e5dfb"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "9a9fc61875f0427c26107b96ee3a6f7d71717c0d4aa6e41cc7b1b56bff2131e7"; } - { locale = "be"; arch = "linux-i686"; sha256 = "afc862a2a1054f08cffa0ec4facb2e9098fb042f7e4dab85c2ace7f30a384426"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "50353005857df556840fab0b18e8784dc18cbcdc5c45f4fc1f68f6b78b58048c"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "4876fcda18fd01b51f392a56085ebfcb97cefd69355666f42d58ffe53b9eb8e9"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "ef90a31aa408c6c86f3103d7bc82e3e8b5ac7bc9956d431ef46e1f44156b7dbf"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ee4a961e76e63a79d08118e2355e37b1b2a1e0260613532ac6dc7c9a9e86caf1"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "9a1233c0ee7a72f8b1c071a6cd507d870d34bd64c71f7f960c00cf2e840ea5b1"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "00bf471763ca98d7c7e0243f5bbc75230b6cf8cea9c5dab17464c47544d102de"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "61e474bd0c930b9d6bcc553a87c07e415e1fe037dd033a6a97f9137d4fc73f49"; } - { locale = "de"; arch = "linux-i686"; sha256 = "e93520901aa59938e1c51c9943225dded88c668a91da6660de9f41714114ac8b"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "008156ddb73f4eb91d801d8bc35685e517328b5e5f13a4ed39873df471d01c67"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "20b3b10e12238238737fa0da3dce5e2fdff1161594b415c5872dd7416001482b"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "79f854469ac1a6fb0768934dc20ebc511a01904c71f321ed31ebe400ab88f4d8"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "61cec7fef6e75ecd7d459e973b258c5b62af0dbfd175b7000484594e63ead2e4"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "83b3761bfd949e3890c7006ba9610e858fab25815cd6e2f3f293ca707086a78c"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "f36321189ed80130b9e4a3a6e387531c48745f4c109f35afe928cf2d44e1b424"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "81da71b2ce832788213ed60f801fd79e61205a98c44e9082a35f2195af314de8"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "b759d93d78964eb8b9ce5aaad37d652fa425cfb5d6049f58a31c2492e3aa475d"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "62b32a8a4e7455c42bbf8cc5029919a64ca2ff61e06f535dd628a8dd612a15d9"; } - { locale = "da"; arch = "linux-i686"; sha256 = "4ad6ede882e973b37627105812619d2e8c804d50d496d96f68554bf75ca093fe"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "9fd6ce0edef1a8c8eb7d811afa39600a2c946f9ed87610a9e98a971d4cf31b08"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "35254ef736865d1a7c368e62c9cba68fa64b7f017aca4d9569aeb18b5f559717"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "6ff8a5b4ebfb9217b37afdfc4d5cab01f1ce66387010d2105a51bed486eea52c"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "eb4af3ff107f6827d0288bd68486b8eef174c5dc6e9b5313099d99b2e695db0d"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "80a6bf800a53af0cc9445c632546ce7cefcf5bd819e6e5e35e662330d58d757c"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "09c193e865e90b6d2c547c17d10add7d43e8b89b630a8a490323d4ed391c924d"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "57610296c564291a8432fdb9215bcfbab6f09792c47e5606c1619bb203c7f5de"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "c702acf69957ffd1c4774f42d4f28dc239a4c5bcf6e003c236952167bf9e7e9f"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "56ae2d38af2988791163e6b118c781d55e2c545097aa5afccc72998705312888"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "c5386f149831aa2f48b65391f31f8f2e0a9c3b7a8bcaae67420a5819e80315ec"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "8409401c0b87be071d081c03eb34e3338cb62e80669045f5d268f8da60d96bce"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "4f93e9b0688e30586b3d372944ae5579f7249220733d6045e6bca3830e7f121a"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "ae1608b9e15862f82d15c5acbcd9f65775efc4368588bc685ebff523ff93e2d6"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "2466f020209de610f429315e0b090b43cf42c9ce540c6bc51e7ad11f5a3449f5"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "76cbcf31388cbe72ebbf3fa3be66a0cfe20cd572febf062f3a58a9c50313aa03"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "e4aa9dd8bb21f3d79ce5f9cfc907fc8a355fef349dcdec30403d534bf3cfbdf6"; } - { locale = "et"; arch = "linux-i686"; sha256 = "06561fa96d5166bfbe8eb492ebc08b3d2a768a8a7a251b357dec89ad33f3825e"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "85e663261cc6722c25dd36e1c0a15b7a82a3a6aaca54191effe8ea09ccb8c43e"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "d80f116d39e48b42a767fbda5b6e765be4bc3d210cf95d80bb014606785be3e6"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "c2e124736d63581a3034e60fe3d40bfef9458a712853ab5c8c5d391a9d3af6a9"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "a1e9954236de1d0581342fbb894b721528bc51a208d3bbedd4d8defbcc1cb50f"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "0fe9c22ad8cf575813ae8e476d985a3b951174df5beda67fd98e261f831252aa"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "35fb5c44bc3ed25beec4f6172c44f75426579f27bd2302361870615bb1f62194"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "3b04ffd5e1640c0138e5dab63a1059bd0342fff9f44547c6b34fbe6da810f911"; } + { locale = "ta-LK"; arch = "linux-i686"; sha256 = "2e8a1b96820216fda11c234d80a74d7326b49d7ac3f595f646aa10dccde61940"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "006f25951b4ac90b8d8d32491d260900dfcfb24c10cd4a10dbadf3840b4bcd4e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "839e95de15a4e0287cfe36d70e07d1d40a1708016f615244a84553794ac76b4c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "592a353df70c368c3c9855ead6d3b68433e7ebaaf42169108b9e74a83517230b"; } + { locale = "de"; arch = "linux-i686"; sha256 = "890bc1ee046ebf67079bd39ecb761a78fbf8cee8f72b32958ad18a0c3184b23b"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "7b52dfc2cea5bedae2ccfe11b0ec2d66edb81b76c2272c60f4bb247970384c9f"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "6ab1e46650ff296719e498a1b9e5dad5c2f32e6be9d6fec12d1ab917a5f76872"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "fdb170e3f546de759ef8a8aa85f6c3bf5152e121739cc27797c3065f4f85c183"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "208be79ce95d45f4f69d8bf53d4e2f457410653a81117b4bd4d42bf14a1485dc"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "2e562f9f59457d484ccfb1beb0129e2ca3ba4e5cbf5c955a65480836dc2e6567"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "07c7836bac31fa835c244dbe5eff19bad5dc5a9339cb8a94bd07d88f8590c867"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "7124de1e3cff7a5c17506f8e175aab1aaf96d4c9fd57824d6c0af110f47b1fbc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5d4e7f1f82b53161e84abf45f4a7210f0304399efed2df621c2e24cd5f1e1db0"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "814798f7dd066228ae73ce6bfdf430db4f0c4e905ce8a6670c73f894865dbf4e"; } + { locale = "si"; arch = "linux-i686"; sha256 = "35727d874cdeca69e18cedc109b6c3540c8dbb7450b2158cb1209cf00272cc38"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "0aa2232adc0e06c0a841a11155c2cd8f317b2f12b0e02c239ebe6150ad3bc278"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "b45871e531b18a35f60240dc0417e5a9f08f8c9e3ea762a36e938425505df8b0"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "a32dd96a41ed33a81c240c60c3538db45c1c4357ceaf37c8482a378a526c5454"; } + { locale = "br"; arch = "linux-i686"; sha256 = "3162753876da622895175afb60cd89be1ee343a10a45f9ac3feb3b306e161838"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "7c8d26a07d239f18f94f14696036974317ac1186072ba4482c315d02dcb97e5f"; } + { locale = "da"; arch = "linux-i686"; sha256 = "8cfaf98f3702b418bfd7692373b9f6e99a4b06e47a75a2df602e98d8f6acf761"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "6bd9ab36402f3391abc2e96f8786e16407736cf04d524e562736ac47279e2a26"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "0a3e7c130197d4abcbf4d37eef51a946c11cf72707686f8c7a0caa9cc21e75c8"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "8d4003960a8a7a496662b59834118c8712443761b867e5f54f3bf4a683715d22"; } + { locale = "he"; arch = "linux-i686"; sha256 = "5db77f9d117071feeddb5eadf74ea6332ccf9abaa441ba4d7b0a5f0f3781452d"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "46995a9f269f0385fc9ac9d31ee65d84e79ac81bd61892adaeb1afff991bcc82"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "73071beb9caa24aaac8eec9cfb01f7e333dc6ac438ab36e7f5afa7d850dbeb8e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "a17cc26a51bbcff44837d74bdb35ba0ae10def6f4b536c4a67e9169221bd0afb"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "4782b1f56c1f5fb1f802385d693a96b5013503e97e4d73e43fb90c3331aec839"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "dbba59d0c697e6dc05bc2b554eed2c6040642cb1246a4119cd7c37b0451c6d4e"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "b37a5eaf187d1c026990f55a3e993594a49bb689f1643d2f944c7f3c7cfd6819"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "629132c5cc5f937fb504542662bb8aa7570eee1ae648087dbfb0c6dedadfa53c"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "89e818736957569f91f7f329118b09a27b072c6d7c89f601eb02cd1d870c4088"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "6a3a358227972a0eb60b1b531f322ebb2e604805bfb50b55d88cb8447b443105"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "794b1e0be4bd6f8facebe3aa44f66a139a660d4fe75891f463adb5d7da7b32cb"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "81b51a607844b229d026d9acec4ea1739c365a890857871260b6eca92a176e04"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "924c5c47c76fc09f5a46176ef1a6e3466d783b8a4c08a5e660a03e0e84459116"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "c46c2285a6f1c825e52ea6cd7dda31d6f67be15668ecf71883c55c9fa21a3fd5"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "58a53bf3ad217b36beb9795f34349cfa3f10b7a39044f024c547be31b033ee28"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "21d1f89810a284818c0a73e8abd5b51a9ea58b7db2b9bf6dd5e0119f4bfc13a3"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "67cb3d38230d24c2a7615468ae2465e6f768904e3735ce31833dcba7b98023c5"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "9e6b5351e96b9b2c57ce04fddaf9656adf84bc2a961a8ca614cec2f830d4e2a7"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "80d0a09d93362f7eff9c7a20025080207a14c43e56b132c3962dd1d795d2a85c"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "07d92405612e1000bc0b401481e94548877511ce224f19b23aa4fa192f21d489"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "0d70e52c8dc5bf6f13c8ea2a5762cb94534ec54548c792ae181febc3d23c01cb"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "2962de1886753b81684360ffbf97afa4d4371662a6f467ebc369e225d335745d"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "6eacb202078be4de4a86c3fc957dbf482e32ab28805d719aa5d0d7f4fd832f48"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "83ed10b7d9d74a28f9982a9d11840522f214ccb53ed599f9fce6ae26bd9d2298"; } + { locale = "el"; arch = "linux-i686"; sha256 = "227140594d1e12f2edf4e942327a8c64ab922796f7bda324eead8a299a6082ab"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "bc219c6795389fbdf20c4a84a61c350f376374285eff9aaedbc4893fdcbbdc24"; } + { locale = "et"; arch = "linux-i686"; sha256 = "4ac7de0edc1d2b084f38058f8c55e8c2fad0782a1f7f7ac69af5c6f28e2a71f9"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "cf026ebca03f6eb59b81073f754b9989f2023bb61d8dfaacbb28da3372abf43b"; } + { locale = "it"; arch = "linux-i686"; sha256 = "001f67664b02736aa757fa99ec00c8df023ead8f94113d1040092057031c4557"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "39fdd81738e0cea77c0f860f0e5253416daa6bd13f1e9feab4c6a52c6dd981f9"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "0a5a830078e0774e81154f07055613d4b6dd6875be4ac976ac70883cfa0ed9cc"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "a33890be6ac154862b7b80f864990b3bbad2db8adbf1d26bf2cd61b175db673e"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "6f837f1c640c46dd99c4ab691ec6964e40b6d931830d4da604d4329c6d1ecde2"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "a37294fbf0b358e5b9619aa36a20f92fc637a6b0697b8d607b958d256ce81225"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "2bbb5800b9a6d03545ca3dfc8f99f9f30c11e474ea360481f1f7e9610b0a87b0"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e2a68f359f48a19437605b581bf9a8cf911feabfb2b15ec3724c60d1cbfe15ec"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "976fbb88b1c75dc402b9eea76aef4d8a0886ee76bcf65d798a6ae8234b2b297a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "190679f7638b3697b236d971014f0da938aa2d664afb93e7f4d1c0fb51bfb46e"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "530b19e48b0e49047746b2f5dd486cfb19930b1064478c465ce2acb21eac66ba"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "0fe30abe10b4c97aef9ee40550205e0f269c5cfe76c08a36c8cf886a5af78558"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "3f2d2784e3aa75cbd3ca0579d660b50b31e488253e52fedbfefc7c5448803967"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "83e64293ed8d1ecf509e2617a71fed9583e4d4c3de3ae5b50175ad8c0f8322ae"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "aa282b17eeeb185734f33d2ed9f287958d8a48ed82653d197426e3e3091ecba3"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "c17db84f0cfd5525e4b8a08e300cabbbcd2bc45f59eb886e180eef0f8c4e45ef"; } + { locale = "be"; arch = "linux-i686"; sha256 = "909ae64789280db1a07b3b57dfa1a5d337fecd3bd59bacd3bab2eb72dbecb04f"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "9021a15bda3d4947e1ed6ee6666a252e3541b020d8d7eb58e854e426719f8d6d"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "a3536d7e8bb429d562e7731fea8675dc9d442ca8e59cc72eb1b404da12d1d53a"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "99cb049415e4837e615e1946409d1fd62966ae8eb843d89dfb61a6675b5b363f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "06a17ca2ee8f44098252f24dae17589f32c80bd35e127a093c18161751a581fc"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b8537b39f3e1242e3ed705ff919b01eb89ac72cf7c15ef0c44d258069c8ea317"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "f2f1e9babb37f79121034f9b8cbc90fbf9f0fa1c152a7f0d7162aff6f6e33f1a"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "60bc6bd468c820066e00f8108e0912df57a941b4150c06797a7958ec684c4969"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "a88591a1850b56c68dd75b4ecff79a32d46dcb42f788d66bb46d45cd0f0d5672"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "2bb7656dde363f3c3d3c8c8b4dbdb306f7e618491c917bc7c1b6e6f41d30fbf0"; } + { locale = "id"; arch = "linux-i686"; sha256 = "b396c752f7652e5ee31d6bec4bfb70b2d86438d966051f91e4d7a77ce5a924dc"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "1f0595e6953b0b6aa09577f180897760f8f85ba15e00e6ae3b12105c705cdac4"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "4d3a4d283705889759dcb321e4b700896b132634005590e546bf6744e6187260"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "456252e7bb5f29ef3c76afb2df0f406fcf93ef1c6df56d0f209bb85e91c8acce"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7f7189250d76f970bfc1879b2ac6fe2d42bdcf3a652614fa4e080dcc636bbd4c"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "cb389bd9712def87c06ffab3fc50b8fa58c773c6725fd0e0befec3e2ac957ef5"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "8f9bf916357e7385dec5de9e4d58f6dfbe3c7fc6d2b66298304c3630189833e6"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f89251f74b85c22a9f7b97b844a118e498698e205f733f1fb0d7a98787f973ee"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "019a15e1e83b6810de6a4d64deb3eba1a9c2a0c6f1c382582e356445e40d5bda"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "ae1d03ddf4b424edc59e08c65a9fb20107311289e4faf8f06f14bc471b00d35f"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a19dce910ba5be35c0fd51be50bd96be3b3db84587f749ed9a108a14a3b732b7"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "8cb4cb6a99955209026224a4cbbcab7b37b0b9fc38147eeaa439631be7750c08"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "4520a3ae24cc7056eb87d48280999c2c3da6aa76b9182c291512dc80363efb27"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "8803a9477f6ac963bdacfd82f6e6b8aabb217fa6c39b311645e461f38cda3757"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c8eae521293986be6d626302d91abbb88a12855565fd41c3614f7a5d7534f0cd"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9ea7f173533757c99a9c2dfdceab5cc58e583f929a2e7db95184823a00319a0a"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "6b9775f8142273d118870887da2728da4732609395897513739df7b352a4989c"; } + { locale = "is"; arch = "linux-i686"; sha256 = "bcaeea579405f015fcdb78e16cfd92e4c0895614c5966a1a7049a4fe310b1c46"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "7de3a89ece968819fcd7f438aaa2f5762f9d936b20fb3c364467ac123b24182e"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "af7f04ef648264f56dcb62e7e473586f3c5b13d3ecd2918278962f335dda7966"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "8477854792552b471e4eb11f71c79b14544cf438e795feae3082c0f3a31e0c8a"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "21db7e27557670796db9282174e7da04afe3a0c89b31e042f7bbd3992e4e08be"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "8f05b160d346b45308ba0c7dbe531bce043f22abffd2a4d1200628669a3b4aa0"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "5e77c23bdb52dba7b663b574520972e2b78588e5143922c1e1837c0e0bd71a86"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "35e663dad586cce929baa1ec501b149ff586df15a687eb41a8cc619c542a625c"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "211322939ab3b4bfc3e6f0548356c9479db5deb687e1e2232f527462017dcd2d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0d50802a6fd7d9256591076c267759d39af91f680025b03ec6925e21c20494e4"; } ]; arch = if stdenv.system == "i686-linux" From 43ed6b8f62d6705156c77b84c21cf5f0618a0b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 23 Jun 2014 11:57:04 +0200 Subject: [PATCH 142/286] Updating octave to 3.8.1 --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 72c0e2d53759..1addccb4bf88 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -6,13 +6,13 @@ fftw, fftwSinglePrec, zlib, curl, qrupdate }: let - version = "3.8.0"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si"; + sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 From 10d4f1fac7da3e295d9185bbf41bacb760a6be4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jul 2014 10:13:20 +0200 Subject: [PATCH 143/286] Setting retroshare 0.6 as lowPrio, it's unstable. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4933c8fcd5f..f5585ec7c15d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9508,9 +9508,9 @@ let qt = qt4; }; - retroshare06 = callPackage ../applications/networking/p2p/retroshare/0.6.nix { + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { qt = qt4; - }; + }); rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); From e698312c03c56965eebc8b1267509f406ad49763 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Thu, 31 Jul 2014 12:24:30 +0200 Subject: [PATCH 144/286] Ansible: updated to 1.6.10 --- pkgs/tools/system/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 7d96092a3ceb..b3d40712926c 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.10"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz"; - sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z"; + sha256 = "0j133353skzb6ydrqqgfkzbkkj1zaibl1x8sgl0arnfma8qky1g1"; }; prePatch = '' From 62d0a320b32539a6b9efa868183f27f215aa2917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 31 Jul 2014 12:47:17 +0200 Subject: [PATCH 145/286] Revert "Remove obsolete jackaudio version 1." This reverts commit bdb77826d98544ab37741f740dd3516023924b27. Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'. Q: What's the difference between Jack1 and Jack2? A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2 --- pkgs/applications/audio/a2jmidid/default.nix | 4 +-- pkgs/applications/audio/ardour/default.nix | 4 +-- pkgs/applications/audio/bristol/default.nix | 4 +-- pkgs/applications/audio/calf/default.nix | 4 +-- pkgs/applications/audio/distrho/default.nix | 4 +-- pkgs/applications/audio/drumkv1/default.nix | 4 +-- .../applications/audio/fluidsynth/default.nix | 4 +-- pkgs/applications/audio/guitarix/default.nix | 4 +-- pkgs/applications/audio/hydrogen/default.nix | 4 +-- pkgs/applications/audio/ingen/default.nix | 4 +-- .../audio/jack-capture/default.nix | 4 +-- .../audio/jack-oscrolloscope/default.nix | 4 +-- pkgs/applications/audio/jack-rack/default.nix | 4 +-- pkgs/applications/audio/jackmeter/default.nix | 4 +-- pkgs/applications/audio/jalv/default.nix | 4 +-- pkgs/applications/audio/lash/default.nix | 4 +-- .../audio/linuxsampler/default.nix | 4 +-- pkgs/applications/audio/lmms/default.nix | 4 +-- .../applications/audio/mhwaveedit/default.nix | 4 +-- .../audio/milkytracker/default.nix | 4 +-- pkgs/applications/audio/moc/default.nix | 4 +-- pkgs/applications/audio/petrifoo/default.nix | 4 +-- pkgs/applications/audio/projectm/default.nix | 4 +-- pkgs/applications/audio/puredata/default.nix | 4 +-- pkgs/applications/audio/qjackctl/default.nix | 4 +-- pkgs/applications/audio/qsynth/default.nix | 4 +-- pkgs/applications/audio/qtractor/default.nix | 4 +-- pkgs/applications/audio/rakarrack/default.nix | 4 +-- pkgs/applications/audio/samplv1/default.nix | 4 +-- pkgs/applications/audio/seq24/default.nix | 4 +-- pkgs/applications/audio/setbfree/default.nix | 4 +-- .../audio/sonic-visualiser/default.nix | 4 +-- pkgs/applications/audio/synthv1/default.nix | 4 +-- pkgs/applications/audio/vmpk/default.nix | 4 +-- .../audio/xsynth-dssi/default.nix | 4 +-- pkgs/applications/audio/yoshimi/default.nix | 4 +-- .../audio/zynaddsubfx/default.nix | 4 +-- pkgs/applications/misc/blender/default.nix | 4 +-- .../networking/mumble/default.nix | 6 ++-- pkgs/applications/video/mplayer/default.nix | 6 ++-- pkgs/applications/video/mplayer2/default.nix | 6 ++-- pkgs/applications/video/mpv/default.nix | 6 ++-- .../video/simplescreenrecorder/default.nix | 4 +-- pkgs/applications/video/vlc/default.nix | 4 +-- .../interpreters/supercollider/default.nix | 4 +-- pkgs/development/libraries/aubio/default.nix | 4 +-- pkgs/development/libraries/dssi/default.nix | 2 +- .../libraries/haskell/jack/default.nix | 4 +-- pkgs/development/libraries/mlt/default.nix | 4 +-- pkgs/misc/emulators/mednafen/default.nix | 4 +-- pkgs/misc/jackaudio/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 30 +++++++++++++++++++ .../linux/alsa-plugins/default.nix | 6 ++-- pkgs/servers/pulseaudio/default.nix | 6 ++-- pkgs/tools/misc/timidity/default.nix | 6 ++-- pkgs/top-level/all-packages.nix | 7 +++-- pkgs/top-level/python-packages.nix | 2 +- 57 files changed, 149 insertions(+), 116 deletions(-) create mode 100644 pkgs/misc/jackaudio/jack1.nix diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index c5e35d8867c8..38192311ccfa 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }: +{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }: stdenv.mkDerivation rec { name = "a2jmidid-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; - buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; + buildInputs = [ alsaLib dbus jack2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index ee093eb02afb..62b88cbe0775 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio +, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo + glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 makeWrapper pango perl pkgconfig python serd sord sratom suil diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 5eb4f0c4e9f1..b27ac0586025 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext xlibs.xproto ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 6ed4b7cce98b..efab9202025d 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }: +, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH + cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 809a02e1c7a5..aa3a76c3af13 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio +{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2 , libxslt, lv2, pkgconfig, premake3, xlibs }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3 + alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3 xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xlibs.libXinerama xlibs.libXrender ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index ab8027e23711..34950d1a343d 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }: +{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }: stdenv.mkDerivation rec { name = "drumkv1-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; }; - buildInputs = [ jackaudio libsndfile lv2 qt4 ]; + buildInputs = [ jack2 libsndfile lv2 qt4 ]; meta = with stdenv.lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 89e95f62cd5f..8cba482194e5 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig +{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig , pulseaudio }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-framework CoreAudio"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index e7fb44af2008..777c0ddb2e35 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk -, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2 +, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2 , pkgconfig, python }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio + avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2 ladspaH librdf libsndfile lv2 pkgconfig python ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 74ff2a3407c4..10f15f5882cb 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins +{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins , libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf + alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf libsndfile pkgconfig qt4 scons subversion ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 73138cc269d0..ac46ff6140c1 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv +{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv , lv2, pkgconfig, python, raul, serd, sord, sratom, suil }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python + boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 3b8f0f652a8b..2e6f6b0dd828 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }: +{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { name = "jack_capture-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; }; - buildInputs = [ jackaudio libsndfile pkgconfig ]; + buildInputs = [ jack2 libsndfile pkgconfig ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index dbceb0a336c5..7b4d12a5b877 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }: +{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }: stdenv.mkDerivation rec { name = "jack_oscrolloscope-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - buildInputs = [ SDL jackaudio mesa pkgconfig ]; + buildInputs = [ SDL jack2 mesa pkgconfig ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 1d1128e663d3..8ac47c570dfb 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ]; + buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 158817b68be2..74d98184d9dd 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jackaudio, pkgconfig }: +{ stdenv, fetchurl, jack2, pkgconfig }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - buildInputs = [ jackaudio pkgconfig ]; + buildInputs = [ jack2 pkgconfig ]; meta = { description = "Console jack loudness meter"; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 2baf69cef4fd..70ef5bdec5cb 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil + gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index ad52e7b2d85c..e42babf13ef8 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2 +{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper + buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper pkgconfig readline ]; postInstall = '' diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 1408a1775ee5..2c4b26543ebb 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }: +, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "linuxsampler-svn-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib asio autoconf automake bison jackaudio libgig libsndfile + alsaLib asio autoconf automake bison jack2 libgig libsndfile libtool lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 5195ddd42a13..540777473d41 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg , libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate + SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate libsndfile pkgconfig pulseaudio qt4 ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index a8287b10a298..a1e81be3cb37 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH +{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile + [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile pkgconfig pulseaudio ]; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 965c941113c3..eadbaabcf560 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl +{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl , zlib, zziplib }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { export CPATH=${zlib}/lib ''; - buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ]; + buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index e822e4057417..e5264f5c3d2f 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg -, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag +, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag , libtool }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis - mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool + mpc libsndfile jack2 db libmodplug timidity libid3tag libtool ]; meta = { diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 2e53a22bff3b..152ee442761e 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas +{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs + [ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 pkgconfig ]; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 2dd251ddd5bd..508b6743cc39 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -2,7 +2,7 @@ , glew, ftgl, ttf_bitstream_vera , withQt ? true, qt4 , withLibvisual ? false, libvisual, SDL -, withJack ? false, jackaudio +, withJack ? false, jack2 , withPulseAudio ? true, pulseaudio }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { [ glew ftgl ] ++ optional withQt qt4 ++ optionals withLibvisual [ libvisual SDL ] - ++ optional withJack jackaudio + ++ optional withJack jack2 ++ optional withPulseAudio pulseaudio ; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index d0394b72eddc..9abca0cb0141 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, jackaudio, tk +, alsaLib, jack2, tk }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib jackaudio ]; + buildInputs = [ alsaLib jack2 ]; configureFlags = '' --enable-alsa diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 834ccb751320..ba875255d4a0 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: +{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }: stdenv.mkDerivation rec { version = "0.3.11"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl"; }; - buildInputs = [ qt4 alsaLib jackaudio dbus ]; + buildInputs = [ qt4 alsaLib jack2 dbus ]; configureFlags = "--enable-jack-version"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 05e6da223dad..a5d0e7e621e2 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, jackaudio, qt4 }: +{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }: stdenv.mkDerivation rec { name = "qsynth-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw"; }; - buildInputs = [ alsaLib fluidsynth jackaudio qt4 ]; + buildInputs = [ alsaLib fluidsynth jack2 qt4 ]; meta = with stdenv.lib; { description = "Fluidsynth GUI"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index a15cf2550407..e589adc0e417 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib autoconf automake dssi gtk jackaudio ladspaH + [ alsaLib autoconf automake dssi gtk jack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool libvorbis pkgconfig qt4 rubberband ]; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index ba84fe5eaec2..257a9967a5b0 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jackaudio, libXft, +{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg + buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index c201536ed347..7d8d5fc04abc 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }: +{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }: stdenv.mkDerivation rec { name = "samplv1-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; }; - buildInputs = [ jackaudio libsndfile lv2 qt4 ]; + buildInputs = [ jack2 libsndfile lv2 qt4 ]; meta = with stdenv.lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 9f168f54eafd..10376e02f433 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm, jackaudio, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }: stdenv.mkDerivation rec { name = "seq24-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258"; }; - buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ]; + buildInputs = [ alsaLib gtkmm jack2 pkgconfig ]; meta = with stdenv.lib; { description = "minimal loop based midi sequencer"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0d5b69297538..5119c384cf6a 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, freetype, ftgl, jackaudio, libX11, lv2 +{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2 , mesa, pkgconfig, ttf_bitstream_vera }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig + alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 7704397e6d0a..42c390620427 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,6 +1,6 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo +{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, pulseaudio, qt5, redland , rubberband, serd, sord, vampSDK @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sord pkgconfig # optional - jackaudio + jack2 # portaudio pulseaudio libmad diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index d1c2230cf16d..08c13243804b 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, jackaudio, lv2 }: +{ stdenv, fetchurl, qt4, jack2, lv2 }: stdenv.mkDerivation rec { name = "synthv1-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; }; - buildInputs = [ qt4 jackaudio lv2 ]; + buildInputs = [ qt4 jack2 lv2 ]; meta = with stdenv.lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 7fffa77b5a39..9a75fa5f3831 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, qt4, jackaudio +, qt4, jack2 }: let @@ -22,5 +22,5 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt4 jackaudio ]; + buildInputs = [ qt4 jack2 ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 0cfbfb4c9bd1..85e7235400b2 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jackaudio, +{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH + buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH ladspaPlugins liblo pkgconfig ]; installPhase = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index df0b98cdd9e4..497ab3ac78d6 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib +, jack2, libsndfile, mesa, minixml, pkgconfig, zlib }: assert stdenv ? glibc; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa + alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa minixml zlib ]; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index cd30b5b30847..a5aa7d5c8d95 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml +{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml , pkgconfig, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; - buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c6a6fa7861ca..13d0bfa7a423 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,7 +2,7 @@ , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw -, jackaudioSupport ? false, jackaudio +, jackaudioSupport ? false, jack2 }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw - ] ++ optional jackaudioSupport jackaudio; + ] ++ optional jackaudioSupport jack2; postUnpack = '' diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b2b2e37fd663..0f2a3d93cdbc 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, boost, protobuf, libsndfile , speex, libopus, avahi, pkgconfig , jackSupport ? false -, jackaudio ? null +, jack2 ? null , speechdSupport ? false , speechd ? null }: -assert jackSupport -> jackaudio != null; +assert jackSupport -> jack2 != null; assert speechdSupport -> speechd != null; let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 boost protobuf libsndfile speex libopus avahi pkgconfig ] - ++ (optional jackSupport jackaudio) + ++ (optional jackSupport jack2) ++ (optional speechdSupport speechd); installPhase = '' diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 48fe5da27a09..f3cef6db69f1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -15,7 +15,7 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null -, jackaudioSupport ? false, jackaudio ? null +, jackaudioSupport ? false, jack2 ? null , pulseSupport ? false, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -40,7 +40,7 @@ assert lameSupport -> lame != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ++ optional dvdnavSupport libdvdnav ++ optional bluraySupport libbluray ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport jackaudio + ++ optional jackaudioSupport jack2 ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 ++ optional pulseSupport pulseaudio diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index dd4520fe2906..d8ada6372b10 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -10,7 +10,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? false, jackaudio ? null +, jackaudioSupport ? false, jack2 ? null , pulseSupport ? true, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -28,7 +28,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jackaudio + ++ optional jackaudioSupport jack2 ++ optional pulseSupport pulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index be796f8e0dea..3295640fa5ab 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -14,7 +14,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? true, jackaudio ? null +, jackaudioSupport ? true, jack2 ? null , pulseSupport ? true, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -36,7 +36,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional dvdreadSupport libdvdread ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jackaudio + ++ optional jackaudioSupport jack2 ++ optional pulseSupport pulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 1a04570e8c10..4c58262a5f10 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext +{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext , libXfixes, mesa, pkgconfig, pulseaudio, qt4 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig + alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig pulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3c197d43a7db..71db3d40a46f 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -3,7 +3,7 @@ , pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg -, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image +, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec - udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib + udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 59fb9268372c..a8c967b59678 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, jackaudio, libsndfile, fftw, curl +, jack2, libsndfile, fftw, curl , libXt, qt, readline , useSCEL ? false, emacs }: @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - jackaudio libsndfile fftw curl libXt qt readline ] + jack2 libsndfile fftw curl libXt qt readline ] ++ optional useSCEL emacs; } diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 53ff65720529..7a5351da10e0 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate +{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate , libsndfile, pkgconfig, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python + alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 951278b4433f..ae276c6aa0aa 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM + , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig , ...}: builderDefsPackage diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix index acb4b0b7e570..2e6b6ee1aa3a 100644 --- a/pkgs/development/libraries/haskell/jack/default.nix +++ b/pkgs/development/libraries/haskell/jack/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, enumset, eventList, explicitException, jackaudio, midi +{ cabal, enumset, eventList, explicitException, jack2, midi , nonNegative, transformers }: @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { buildDepends = [ enumset eventList explicitException midi nonNegative transformers ]; - pkgconfigDepends = [ jackaudio ]; + pkgconfigDepends = [ jack2 ]; meta = { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 3d89d6c7d559..00d586a9f04c 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, frei0r, jackaudio, libav, libdv, libsamplerate +{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL frei0r jackaudio libav libdv libsamplerate libvorbis libxml2 + SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig qt sox ]; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 786ed21deccb..c7ef57357500 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libX11, mesa, freeglut -, jackaudio, libcdio, libsndfile, libsamplerate +, jack2, libcdio, libsndfile, libsamplerate , SDL, SDL_net, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ]; + [ libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 580d65838515..4f9f071094bc 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { - name = "jackaudio-${version}"; + name = "jack2-${version}"; version = "1.9.9.5"; src = fetchurl { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix new file mode 100644 index 000000000000..d424452ecd58 --- /dev/null +++ b/pkgs/misc/jackaudio/jack1.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid +, firewireSupport ? false, ffado ? null }: + +assert firewireSupport -> ffado != null; + +stdenv.mkDerivation rec { + name = "jack1-${version}"; + version = "0.124.1"; + + src = fetchurl { + url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; + }; + + preBuild = "echo ok"; + + configureFlags = '' + ${if firewireSupport then "--enable-firewire" else ""} + ''; + + buildInputs = + [ pkgconfig alsaLib db libuuid + ] ++ (stdenv.lib.optional firewireSupport ffado); + + meta = { + description = "JACK audio connection kit"; + homepage = "http://jackaudio.org"; + license = "GPL"; + }; +} diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 802658ea2883..1a602858b7ab 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }: stdenv.mkDerivation rec { name = "alsa-plugins-1.0.28"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig alsaLib libogg ] ++ stdenv.lib.optional (pulseaudio != null) pulseaudio - ++ stdenv.lib.optional (jackaudio != null) jackaudio; + ++ stdenv.lib.optional (jack2 != null) jack2; - meta = { + meta = { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 35922b3c46f0..0665222a9e04 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi , gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex , bluez, sbc, udev, libcap, json_c -, jackaudioSupport ? false, jackaudio ? null +, jackaudioSupport ? false, jack2 ? null , x11Support ? false, xlibs , useSystemd ? false, systemd ? null }: -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; stdenv.mkDerivation rec { name = "pulseaudio-5.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex json_c ] - ++ stdenv.lib.optional jackaudioSupport jackaudio + ++ stdenv.lib.optional jackaudioSupport jack2 ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] ++ stdenv.lib.optional useSystemd systemd ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ]; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 89ff6f4677fc..afe75c572c02 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }: +{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }: let inherit (composableDerivation) edf; in @@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} { }; jack = { audioModes = "jack"; - buildInputs = [jackaudio]; - NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"]; + buildInputs = [jack2]; + NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"]; }; } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5585ec7c15d..48a91914dbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7062,7 +7062,7 @@ let alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { - jackaudio = null; + jack2 = null; }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; @@ -11076,7 +11076,10 @@ let hplipWithPlugin = hplip.override { withPlugin = true; }; - jackaudio = callPackage ../misc/jackaudio { }; + # using the new configuration style proposal which is unstable + jack1 = callPackage ../misc/jackaudio/jack1.nix { }; + + jack2 = callPackage ../misc/jackaudio { }; keynav = callPackage ../tools/X11/keynav { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2355d50efcaf..ee29b74f72e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2654,7 +2654,7 @@ rec { sed -i "/use_setuptools/d" setup.py ''; - buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; + buildInputs = [ pkgs.alsaLib pkgs.jack2 ]; meta = with stdenv.lib; { description = "A Python wrapper for the RtMidi C++ library written with Cython"; From e07c2c2cfdda1a77b36bad60f092326dfb767297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 31 Jul 2014 12:56:16 +0200 Subject: [PATCH 146/286] add uTox --- .../instant-messengers/utox/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/utox/default.nix diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix new file mode 100644 index 000000000000..823df5c27a28 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft }: + + +stdenv.mkDerivation rec { + name = "utox-dev"; + + src = fetchFromGitHub { + owner = "notsecure"; + repo = "uTox"; + rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961"; + sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0"; + }; + + buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype + libv4l libXrender fontconfig libXext libXft ]; + + doCheck = false; + + makeFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + description = "Lightweight Tox client"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48a91914dbff..0f0b20d3b60d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9807,6 +9807,8 @@ let uzbl = callPackage ../applications/networking/browsers/uzbl { webkit = webkitgtk2; }; + + uTox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { }; From ecefc22d7668cd90615dc997b3a400b54a5ff37a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 31 Jul 2014 14:35:48 +0300 Subject: [PATCH 147/286] tor: update from 0.2.4.22 to 0.2.4.23 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 57c4a9c56621..d71bbd891f91 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.22"; + name = "tor-0.2.4.23"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0k39ppcvld6p08yaf4rpspb34z4f5863j0d605yrm4dqjcp99xvb"; + sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5"; }; buildInputs = [ libevent openssl zlib ]; From 676daf652991ae32c76f98653bf60d2b30d16de2 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Thu, 31 Jul 2014 13:51:31 +0200 Subject: [PATCH 148/286] cadaver: change to platform.unix and specify licence (gpl2) --- pkgs/tools/networking/cadaver/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 3fed3600b08a..83073df0a98f 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { description = "A command-line WebDAV client for Unix"; homepage = http://www.webdav.org/cadaver; maintainers = with maintainers; [ ianwookim ]; - platforms = platforms.all; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 73f19761550f64f17b4da02ce691b0840f749059 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:10:15 +0200 Subject: [PATCH 149/286] haskell-cgrep: update to version 6.4.5 --- pkgs/development/libraries/haskell/cgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index fa4035b41ab9..3563abb0a856 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.4"; - sha256 = "1czy9skv3jcfljwxml4nprmsxq70pav7mqhk92jg5wj1klgrz21k"; + version = "6.4.5"; + sha256 = "0pp3gfy8dvdbv40vfy3dhqymjp0knnbzv9hmbc18f3s8zpy4lis0"; isLibrary = false; isExecutable = true; buildDepends = [ From 689b322e10fc0853844e5d6acaec204c443bcb05 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:10:27 +0200 Subject: [PATCH 150/286] Agda: update to version 2.4.0.2 --- .../compilers/agda/{2.4.0.1.nix => 2.4.0.2.nix} | 6 ++++-- pkgs/top-level/haskell-packages.nix | 10 +++------- 2 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/development/compilers/agda/{2.4.0.1.nix => 2.4.0.2.nix} (85%) diff --git a/pkgs/development/compilers/agda/2.4.0.1.nix b/pkgs/development/compilers/agda/2.4.0.2.nix similarity index 85% rename from pkgs/development/compilers/agda/2.4.0.1.nix rename to pkgs/development/compilers/agda/2.4.0.2.nix index e472eb1c276b..6705419add9b 100644 --- a/pkgs/development/compilers/agda/2.4.0.1.nix +++ b/pkgs/development/compilers/agda/2.4.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence , filepath, geniplate, happy, hashable, hashtables, haskeline , haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.0.1"; - sha256 = "11my5k606zvra3w3m1wllc4dy5mfv4lr32fqd579vqcks6wpirjq"; + version = "2.4.0.2"; + sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a995a6dd598..2f977be95285 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2758,18 +2758,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; - Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix { - binary = self.binary_0_7_2_1; - QuickCheck = self.QuickCheck_2_7_5; - equivalence = self.equivalence_0_2_3; - }; - Agda = self.Agda_2_4_0_1; + Agda_2_4_0_2 = callPackage ../development/compilers/agda/2.4.0.2.nix {}; + Agda = self.Agda_2_4_0_2; AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; }; AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { - Agda = self.Agda_2_4_0_1; + Agda = self.Agda_2_4_0_2; }; AgdaStdlib = self.AgdaStdlib_0_8; From 5f2ad413b704a747e29a7aecf5745a7bebb5e0c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:10:42 +0200 Subject: [PATCH 151/286] haskell-xml-html-conduit-lens: add version 0.3.2.0 --- .../haskell/xml-html-conduit-lens/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix new file mode 100644 index 000000000000..b6fd82d622cc --- /dev/null +++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, hspec, hspecExpectationsLens, htmlConduit, lens +, text, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "xml-html-conduit-lens"; + version = "0.3.2.0"; + sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0"; + buildDepends = [ htmlConduit lens text xmlConduit ]; + testDepends = [ + doctest hspec hspecExpectationsLens lens xmlConduit + ]; + meta = { + homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; + description = "Optics for xml-conduit and html-conduit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2f977be95285..6dc9cbdccb93 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2681,6 +2681,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlHtmlConduitLens = callPackage ../development/libraries/haskell/xml-html-conduit-lens {}; + xmlLens = callPackage ../development/libraries/haskell/xml-lens {}; xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; From 7387244094de4ec4d1801176bd791502b12c0e18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:11:25 +0200 Subject: [PATCH 152/286] haskell-vty: update to version 5.1.4 --- .../libraries/haskell/vty/{5.1.3.nix => 5.1.4.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vty/{5.1.3.nix => 5.1.4.nix} (93%) diff --git a/pkgs/development/libraries/haskell/vty/5.1.3.nix b/pkgs/development/libraries/haskell/vty/5.1.4.nix similarity index 93% rename from pkgs/development/libraries/haskell/vty/5.1.3.nix rename to pkgs/development/libraries/haskell/vty/5.1.4.nix index 412be2c2001e..326eaf08d3d8 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.3.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.4.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.3"; - sha256 = "0li20ypydal2xab5hpcwi2az78j2hsdwfx3cv7hinsc55w08wchj"; + version = "5.1.4"; + sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6dc9cbdccb93..509c2067ec0d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2575,8 +2575,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_1_3 = callPackage ../development/libraries/haskell/vty/5.1.3.nix {}; - vty = self.vty_5_1_3; + vty_5_1_4 = callPackage ../development/libraries/haskell/vty/5.1.4.nix {}; + vty = self.vty_5_1_4; vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; From c9dc75d31599ee98ca969e0e027d238e85215efb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:11:42 +0200 Subject: [PATCH 153/286] idris: re-generate with cabal2nix --- pkgs/development/compilers/idris/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 48682210be1e..f0b07f9d0fa3 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -15,7 +15,6 @@ cabal.mkDerivation (self: { sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; isLibrary = true; isExecutable = true; - jailbreak = true; buildDepends = [ annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree @@ -27,6 +26,7 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; + jailbreak = true; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; From 2d2237ed175cb7842301a08da49aef6b11fba39c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:08 +0200 Subject: [PATCH 154/286] haskell-GLUtil: update to version 0.8 --- pkgs/development/libraries/haskell/GLUtil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index 10ab2bf69e6c..ce4b41c93e0a 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.7.5"; - sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz"; + version = "0.8"; + sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8"; buildDepends = [ cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; From ca971dfa2768cf33b2917988b48081d52382c70d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:10 +0200 Subject: [PATCH 155/286] haskell-fay-base: update to version 0.19.2 --- pkgs/development/libraries/haskell/fay-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 9dd38ecda4be..78d099e3100a 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.1.2"; - sha256 = "0y2gpyh0gama6mz0rfvqdgpf7wfwx7r8k0cdfh60kjcxr029dx5i"; + version = "0.19.2"; + sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; From 78ad8ce04625a9e907bbea2357de2720f8d38ac9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:12 +0200 Subject: [PATCH 156/286] haskell-lens: update to version 4.3.3 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e0f4d314e31b..655525e4d598 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.3.2"; - sha256 = "0bkdiggw3lzq18ijl9md0v6j847hx4qda0sqf9l6plf0b8yirryj"; + version = "4.3.3"; + sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f"; buildDepends = [ aeson attoparsec bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive From f194df999f6a894dcd1d79bd0fa6f76253a781e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:14 +0200 Subject: [PATCH 157/286] haskell-liblastfm: update to version 0.4.0.0 --- .../libraries/haskell/liblastfm/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index ea4febaf1d1a..8ea830d0c392 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,16 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, cereal, contravariant, cryptoApi, httpConduit -, httpTypes, network, pureMD5, semigroups, tagged, text, void +{ cabal, aeson, cereal, contravariant, cryptoApi, hspec +, hspecExpectationsLens, httpClient, httpClientTls, HUnit, lens +, network, profunctors, pureMD5, semigroups, text, void, xmlConduit +, xmlHtmlConduitLens }: cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.3.2.0"; - sha256 = "09xsjkwknfvdd3zb7a1qbch45ri6knkn33wl6xbi48sw5i79lxnv"; + version = "0.4.0.0"; + sha256 = "0dr1nvb7sxlp1fihvnwz9lyfmaynbj39npah2ndvlgnzz670j0z9"; buildDepends = [ - aeson cereal contravariant cryptoApi httpConduit httpTypes network - pureMD5 semigroups tagged text void + aeson cereal contravariant cryptoApi httpClient httpClientTls + network profunctors pureMD5 semigroups text void xmlConduit + ]; + testDepends = [ + aeson cereal contravariant cryptoApi hspec hspecExpectationsLens + httpClient httpClientTls HUnit lens network profunctors pureMD5 + text void xmlConduit xmlHtmlConduitLens ]; meta = { description = "Lastfm API interface"; From c816e89348fdce4a263e89355194e89c59449eb4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:16 +0200 Subject: [PATCH 158/286] haskell-network-simple: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/network-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index 6795da96450b..b838e93f7a31 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-simple"; - version = "0.4"; - sha256 = "1jw0xd53c0mydh6jm6627c0d8w014r1s46fycdhavnimh7bb77cp"; + version = "0.4.0.1"; + sha256 = "113vaxgsfny9iv6hnbywk97qr1y6qkap49p803anakamss4bdmyj"; buildDepends = [ exceptions network transformers ]; jailbreak = true; meta = { From 56fb2db243a8ed4e54744f5939f54aa9f8e55620 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:20 +0200 Subject: [PATCH 159/286] haskell-pipes-network: update to version 0.6.4 --- pkgs/development/libraries/haskell/pipes-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index fcd194026484..95345e0513e9 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-network"; - version = "0.6.3"; - sha256 = "09gihca0hinq3sqsx9753gmas6g22pg792ag6ckdw5z3607razrg"; + version = "0.6.4"; + sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p"; buildDepends = [ network networkSimple pipes pipesSafe transformers ]; From 7fa6ba94689bd3ca5ee84ddeccc6eae73840cbd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:22 +0200 Subject: [PATCH 160/286] haskell-profunctors: update to version 4.2.0.1 --- pkgs/development/libraries/haskell/profunctors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 248cd89a2ba0..00d339fa44e8 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "4.2"; - sha256 = "0ikbp88798q7hdvi5vpc68q5bblsh43g9xnlwrifrn5fp3x3lq56"; + version = "4.2.0.1"; + sha256 = "00cfria3zjijx9nm533a25x240c7q0sn9vna6m4y4rz1f7l2gnqc"; buildDepends = [ comonad distributive semigroupoids tagged transformers ]; From a37b5628f6c4309903dcd902505502a8aa512cac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:24 +0200 Subject: [PATCH 161/286] haskell-resourcet: update to version 1.1.2.3 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 39ea2050cca1..fec45e6fcd91 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.2.2"; - sha256 = "1j468zkjd7j2xpgzx1i36h3lpamnqpk0rj3miwfr9a0ibm7bz1as"; + version = "1.1.2.3"; + sha256 = "1n1z1q3k8lg3wqdkrmcfl9mvlx1p81gkh5j911w1006rnm8r87im"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase From a2b15807167480b3b49ca67735ca0c0c3c75940e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:26 +0200 Subject: [PATCH 162/286] haskell-semigroupoids: update to version 4.2 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 037bef6b179e..ca625f5eb754 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "4.0.4"; - sha256 = "0yk536pbjblncpjinl739lppxsvb0w7z3hgrj43c0dqam0dyr38r"; + version = "4.2"; + sha256 = "18zip518f2l2ccmg3hjzy5mq2b8r98crzm10kr77yc4m64w5vac8"; buildDepends = [ comonad contravariant distributive semigroups transformers ]; From 9e4a54f4a6a39b4de00123b27e41a0f0f6e3c750 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:28 +0200 Subject: [PATCH 163/286] haskell-yesod-core: update to version 1.2.19 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 89f096024104..944a60fe29f6 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.18"; - sha256 = "08d62wjx8smvi75490fp2f5ayv5jsgkxqi33lqhv9lxgv3ckk8vi"; + version = "1.2.19"; + sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie From bb4d15a115a736e785d35d328c4fb9bfb7ed6d6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 12:12:30 +0200 Subject: [PATCH 164/286] haskell-yesod-form: update to version 1.3.14 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2fcd8f5a0f94..3ac24f874626 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.13"; - sha256 = "1asywf0a75gj3d55g700132m49mglim23kxqczrx10ll1k076sfw"; + version = "1.3.14"; + sha256 = "0a2xlar67f0y48zqml8kqjna33i474j3j04gmgglsfmk1wikr7sh"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet From 6d40d5e564b3966b496c5ea76c341321221aca31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 15:48:24 +0200 Subject: [PATCH 165/286] haskell-hackage-db: update to version 1.8 --- pkgs/development/libraries/haskell/hackage-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 3164d2138705..e09e455d560c 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hackage-db"; - version = "1.7"; - sha256 = "0mf22xxbcbjb7l4jahknp6s7lsfn43ib7z9m2jsg9py92vkacfp1"; + version = "1.8"; + sha256 = "0iav085xq4d6k9z0x7jlnw3r3wwnzbr7ygbaqnblj6mcpnps9r3q"; buildDepends = [ Cabal filepath tar utf8String ]; meta = { homepage = "http://github.com/peti/hackage-db"; From d4a863bdebfd488b8f60164180d406b690fe1ab9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 15:48:26 +0200 Subject: [PATCH 166/286] haskell-optparse-applicative: update to version 0.9.1.1 --- .../libraries/haskell/optparse-applicative/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 191efd723f79..82bc0fa8a9ee 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.9.0"; - sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay"; + version = "0.9.1.1"; + sha256 = "1fy8839y9dg2a5pj7abjiqkm3qcz8faip32q3x1zi5mrz4v3q2g6"; buildDepends = [ ansiWlPprint transformers transformersCompat ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit From 14ad244d926d80c2956c86fb5e204d20e154df9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 15:48:28 +0200 Subject: [PATCH 167/286] haskell-snaplet-redis: update to version 0.1.3.3 --- pkgs/development/libraries/haskell/snaplet-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index e0cb67e120a1..d6bfcd260ca3 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.2"; - sha256 = "0554farc76ncbynzks4ryi7a2nbahsgnjvazmw5n9b79cp207bjf"; + version = "0.1.3.3"; + sha256 = "17w2b9cnri45m535hyszb1fickhhglid3zy5a4bbljmnwvi4y08l"; buildDepends = [ configurator hedis lens mtl network snap transformers ]; From ae6d32ffd3af212a8218e99794e1a2c392f39768 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 Jul 2014 15:48:30 +0200 Subject: [PATCH 168/286] haskell-cabal2nix: update to version 1.67 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 04e9f1cfea18..1e6e69036e2e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.66"; - sha256 = "1is72jfv6snz59jpmg7dfcinpi3q4kdiqchd7zf45rqrszd5h43p"; + version = "1.67"; + sha256 = "1l614lx5l3rhn0jvs45is9m8bil32ms5lb74j30ialv3qnjsvjnv"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 410f2a9dabe52c490858618cf827b82828cf5938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 31 Jul 2014 15:48:06 +0200 Subject: [PATCH 169/286] lttng: align attribute name with package name lttngModules => lttng-modules lttngTools => lttng-tools lttngUst => lttng-ust But keep the old attributes around for backward compatibility. --- pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 541385d8bec2..5758500d86f9 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: stdenv.mkDerivation rec { name = "lttng-tools-2.4.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; }; - buildInputs = [ popt libuuid liburcu lttngUst ]; + buildInputs = [ popt libuuid liburcu lttng-ust ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98f4d27669ef..2a9a219da173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4006,9 +4006,9 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; - lttngTools = callPackage ../development/tools/misc/lttng-tools { }; + lttng-tools = callPackage ../development/tools/misc/lttng-tools { }; - lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; lttv = callPackage ../development/tools/misc/lttv { }; @@ -7439,7 +7439,7 @@ let ktap = callPackage ../os-specific/linux/ktap { }; - lttngModules = callPackage ../os-specific/linux/lttng-modules { }; + lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; @@ -11418,6 +11418,9 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; asciidocFull = asciidoc-full; # added 2014-06-22 + lttngModules = lttng-modules; # added 2014-07-31 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 }; in self; in pkgs From 880fb28ecd06f0e38ee11b84ff2a52c647a6cfdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Jun 2014 15:41:17 +0200 Subject: [PATCH 170/286] xfce4-power-manager: update to 1.3.0, supporting upower-0.99 (cherry picked from commit 2027dcc4f9444bf52e92556531e550c08b094918) --- .../core/xfce4-power-manager-brightness.patch | 307 ------------------ .../xfce/core/xfce4-power-manager.nix | 10 +- 2 files changed, 4 insertions(+), 313 deletions(-) delete mode 100644 pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch b/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch deleted file mode 100644 index 6b6f14fdae78..000000000000 --- a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch +++ /dev/null @@ -1,307 +0,0 @@ -From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Tue, 23 Jul 2013 11:27:41 +0200 -Subject: Change brightness level from glong to gint32 - -The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue. - -diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c -index aa1ef33..f1524cb 100644 ---- a/common/xfpm-brightness.c -+++ b/common/xfpm-brightness.c -@@ -92,11 +92,11 @@ out: - } - - static gboolean --xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current) -+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current) - { - unsigned long nitems; - unsigned long bytes_after; -- long *prop; -+ gint32 *prop; - Atom actual_type; - int actual_format; - gboolean ret = FALSE; -@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l - } - - static gboolean --xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level) -+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level) - { - gboolean ret = TRUE; - -@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l - - if ( gdk_error_trap_pop () ) - { -- g_warning ("failed to XRRChangeOutputProperty for brightness %li", level); -+ g_warning ("failed to XRRChangeOutputProperty for brightness %d", level); - ret = FALSE; - } - -@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness) - } - - static gboolean --xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) -+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level) - { -- long hw_level; -+ gint32 hw_level; - gboolean ret = FALSE; -- long set_level; -+ gint32 set_level; - - ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); - -@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) - - if ( !ret ) - { -- g_warning ("xfpm_brightness_xrand_up failed for %li", set_level); -+ g_warning ("xfpm_brightness_xrand_up failed for %d", set_level); - return FALSE; - } - - /* Nothing changed in the hardware*/ - if ( *new_level == hw_level ) - { -- g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level); -+ g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level); - return FALSE; - } - -@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) - } - - static gboolean --xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) -+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level) - { -- long hw_level; -+ gint32 hw_level; - gboolean ret; -- long set_level; -+ gint32 set_level; - - ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); - -@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) - - if ( !ret ) - { -- g_warning ("xfpm_brightness_xrand_down failed for %li", set_level); -+ g_warning ("xfpm_brightness_xrand_down failed for %d", set_level); - return FALSE; - } - - /* Nothing changed in the hardware*/ - if ( *new_level == hw_level ) - { -- g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level); -+ g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level); - return FALSE; - } - -@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness) - } - - static gboolean --xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level) -+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level) - { - int ret; - -@@ -406,11 +406,11 @@ out: - } - - static gboolean --xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) -+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level) - { -- glong hw_level; -+ gint32 hw_level; - gboolean ret = FALSE; -- gint set_level; -+ gint32 set_level; - - ret = xfpm_brightness_helper_get_level (brightness, &hw_level); - -@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) - } - - static gboolean --xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level) -+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level) - { -- glong hw_level; -+ gint32 hw_level; - gboolean ret; -- gint set_level; -+ gint32 set_level; - - ret = xfpm_brightness_helper_get_level (brightness, &hw_level); - -@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness) - return FALSE; - } - --gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) -+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level) - { - gboolean ret = FALSE; - -@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) - return ret; - } - --gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level) -+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level) - { - gboolean ret = FALSE; - -@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness) - return brightness->priv->max_level; - } - --gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) -+gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level) - { - gboolean ret = FALSE; - -@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) - return ret; - } - --gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level) -+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level) - { - gboolean ret = FALSE; - -diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h -index 0c4e3ed..26b3dbe 100644 ---- a/common/xfpm-brightness.h -+++ b/common/xfpm-brightness.h -@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new (void); - gboolean xfpm_brightness_setup (XfpmBrightness *brightness); - - gboolean xfpm_brightness_up (XfpmBrightness *brightness, -- glong *new_level); -+ gint32 *new_level); - - gboolean xfpm_brightness_down (XfpmBrightness *brightness, -- glong *new_level); -+ gint32 *new_level); - - gboolean xfpm_brightness_has_hw (XfpmBrightness *brightness); - - gint xfpm_brightness_get_max_level (XfpmBrightness *brightness); - - gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, -- glong *level); -+ gint32 *level); - - gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, -- glong level); -+ gint32 level); - - gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness); - -diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c -index 6e60c29..bd466c9 100644 ---- a/panel-plugins/brightness/brightness-button.c -+++ b/panel-plugins/brightness/brightness-button.c -@@ -186,7 +186,7 @@ static gboolean - brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time) - { - gint x, y; -- glong current_level = 0; -+ gint32 current_level = 0; - GdkDisplay *display; - GdkScreen *screen; - BrightnessButton *button; -@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button) - static void - range_value_changed (GtkWidget *widget, BrightnessButton *button) - { -- glong range_level, hw_level; -+ gint32 range_level, hw_level; - - range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range)); - -@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button) - static void - brightness_button_up (BrightnessButton *button) - { -- glong level; -- glong max_level; -+ gint32 level; -+ gint32 max_level; - - xfpm_brightness_get_level (button->priv->brightness, &level); - max_level = xfpm_brightness_get_max_level (button->priv->brightness); -@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button) - static void - brightness_button_down (BrightnessButton *button) - { -- glong level; -+ gint32 level; - xfpm_brightness_get_level (button->priv->brightness, &level); - - if ( level != 0 ) -diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c -index baeeb43..45c990f 100644 ---- a/src/xfpm-backlight.c -+++ b/src/xfpm-backlight.c -@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate - gboolean has_hw; - gboolean on_battery; - -- glong last_level; -- glong max_level; -+ gint32 last_level; -+ gint32 max_level; - - gboolean dimmed; - gboolean block; -@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight) - - if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL ) - { -- glong dim_level; -+ gint32 dim_level; - - g_object_get (G_OBJECT (backlight->priv->conf), - backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level, -@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight) - **/ - if (backlight->priv->last_level > dim_level) - { -- XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level); -+ XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level); - backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level); - } - } -@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight) - { - if ( !backlight->priv->block) - { -- XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level); -+ XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level); - xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level); - } - backlight->priv->dimmed = FALSE; -@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight) - static void - xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight) - { -- glong level; -+ gint32 level; - gboolean ret = TRUE; - - gboolean enable_brightness, show_popup; --- -cgit v0.10.1 - diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 45e213473f84..81a0aebb75ce 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf +{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf , libxfce4ui, libxfce4util, libnotify, xfce4panel }: stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; - ver_maj = "1.2"; + ver_maj = "1.3"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp"; + sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util + [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util libnotify xfce4panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - patches = ./xfce4-power-manager-brightness.patch; - meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; From bc8abb22427c161593f4c6456983a3e5a30349b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Jun 2014 15:53:24 +0200 Subject: [PATCH 171/286] libxfce4util: minor update 4.10.0 -> 4.10.1 (cherry picked from commit 5c72dac5487df7c230eea7a4559db54ce32106ef) --- pkgs/desktops/xfce/core/libxfce4util.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 88874722b7d0..8483aec7a46f 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "libxfce4util"; ver_maj = "4.10"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"; + sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78"; }; name = "${p_name}-${ver_maj}.${ver_min}"; From ace3d4685d09dec33af08530b4909c37d0585f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Jun 2014 16:00:41 +0200 Subject: [PATCH 172/286] xfce4-appfinder: update 4.9.4 -> 4.10.1 (cherry picked from commit 8aa892489e5b1dfa0fce3a64ea16c6286cd02232) --- pkgs/desktops/xfce/core/xfce4-appfinder.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index df218190357a..01848d66696a 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-appfinder"; - ver_maj = "4.9"; # no 4.10 (stable) release yet - ver_min = "4"; + ver_maj = "4.10"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq"; + sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5"; }; name = "${p_name}-${ver_maj}.${ver_min}"; From ddcc1637116329e7a3bad3ec293fddaf2ed3420f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 28 Jun 2014 08:16:36 +0200 Subject: [PATCH 173/286] libav: maintenance updates of all three branches (cherry picked from commit c61c7e7313fdc5e402b0f71e0430ae3367a7c55c) --- pkgs/development/libraries/libav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b21f530478a3..cd80d61d1916 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr"; - libav_9 = libavFun "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g"; - libav_10 = libavFun "10.1" "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m"; + libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685"; + libav_9 = libavFun "9.14" "07gn4lbqx6wfhb2h2ddj88hcsacwmzb4syalg211m55xmp1g1fp4"; + libav_10 = libavFun "10.2" "06wvk51cnllw6367qagc90sva4jr5d0r6jx8183wcwzwzgv01w29"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { From dac1791fb5661eaf06355982135c4674d0e6e4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Jul 2014 22:18:24 +0200 Subject: [PATCH 174/286] thunderbird: major update 17.* -> 31.0 - To fix build problems, I refactored the build process according to Mozilla recommendations. - 31.0 should become the next ESR branch (31 released today). CC @nbp @edolstra (cherry picked from commit adc2edd5cf524239690b5cf49779a11fd2eb061b) --- .../mailreaders/thunderbird/default.nix | 99 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 85dab3777ba9..c0c11ff1f1c3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip -, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss -, libnotify, cairo, pixman, fontconfig -, libjpeg -, pythonPackages - +{ stdenv, fetchurl, pkgconfig, m4, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu +, debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" # instead of "Shredder", enable this option. However, those # binaries may not be distributed without permission from the @@ -12,59 +13,75 @@ enableOfficialBranding ? false }: -let version = "17.0.11"; in -let verName = "${version}esr"; in +let version = "31.0"; in +let verName = "${version}"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "thunderbird-${verName}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp"; + sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5"; }; - #enableParallelBuilding = true; + buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx + [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification cairo icu + ] ++ [ m4 ]; - buildInputs = - [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr - libnotify cairo pixman fontconfig yasm mesa nss - libjpeg pythonPackages.sqlite3 - ]; - - configureFlags = - [ "--enable-application=mail" - "--enable-optimize" - "--with-pthreads" - "--disable-debug" - "--enable-strip" - "--with-pthreads" + configureFlags = [ "--enable-application=mail" ] + # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx + ++ [ "--with-system-jpeg" - #"--with-system-png" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" "--with-system-nss" - # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975 - #"--enable-system-cairo" + "--with-system-libevent" + #"--with-system-libvpx" + "--with-system-png" + "--with-system-icu" + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--disable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now "--disable-crashreporter" - "--disable-necko-wifi" - "--disable-webm" "--disable-tests" - "--enable-calendar" - "--disable-ogg" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]) + ++ [ + "--disable-javaxpcom" + "--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7 ] ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - # The Thunderbird Makefiles refer to the variables LIBXUL_DIST, - # prefix, and PREFIX in some places where they are not set. In - # particular, there are some linker flags like - # `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to - # `-rpath-link=/bin', the build fails due to the purity checks in - # the ld wrapper. So disable the purity check for now. - preBuild = "NIX_ENFORCE_PURITY=0"; + configurePhase = '' + patchShebangs . - # This doesn't work: - #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)"; + echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig + echo "ac_add_options --prefix='$out'" >> .mozconfig + echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig + + make ${makeFlags} configure + ''; + + makeFlags = "-f client.mk"; + buildFlags = "build"; postInstall = '' @@ -84,7 +101,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Mozilla Thunderbird, a full-featured email client"; + description = "A full-featured e-mail client"; homepage = http://www.mozilla.org/thunderbird/; license = # Official branding implies thunderbird name and logo cannot be reuse, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a9a219da173..397f3164570a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9739,6 +9739,8 @@ let thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + libpng = libpng_apng; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { From 51494f2c33122b67ff29cc696ed3ffb986454b55 Mon Sep 17 00:00:00 2001 From: Danny Groenewegen Date: Thu, 31 Jul 2014 16:51:51 +0200 Subject: [PATCH 175/286] Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202 --- .../web-servers/apache-httpd/tomcat-connector.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix index b2cd53ae55cd..d4165c8c5bac 100644 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix @@ -29,6 +29,14 @@ ${extraWorkersProperties} ''; in { + + options = { + extraWorkersProperties = pkgs.lib.mkOption { + default = ""; + description = "Additional configuration for the workers.properties file."; + }; + }; + extraModules = [ { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; } ]; From fdba7f35fe25f2dbe7ce9811ce0542f7b34005a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 31 Jul 2014 17:02:55 +0200 Subject: [PATCH 176/286] lttng-modules: fix bad attribute reference Fixup error introduced in commit 410f2a9dabe52c490858618cf827b82828cf5938 ("lttng: align attribute name with package name"). lttng-modules is not a top-level attribute. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 397f3164570a..6ec6b2bf181f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7440,6 +7440,7 @@ let ktap = callPackage ../os-specific/linux/ktap { }; lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; + lttngModules = lttng-modules; # added 2014-07-31 broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; @@ -11420,7 +11421,6 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; asciidocFull = asciidoc-full; # added 2014-06-22 - lttngModules = lttng-modules; # added 2014-07-31 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 From a03ec2692b5a1559d14583a26f346a762ed0757e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 31 Jul 2014 17:08:23 +0200 Subject: [PATCH 177/286] lttng: fix evaluation error I'm giving up on the lttngModules backward compatibility attribute :-) --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ec6b2bf181f..7942b236b8bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7440,7 +7440,6 @@ let ktap = callPackage ../os-specific/linux/ktap { }; lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; - lttngModules = lttng-modules; # added 2014-07-31 broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; From 30a941aa88c301bee6c7d1c33887eb1cd455a7e6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 31 Jul 2014 17:58:03 +0200 Subject: [PATCH 178/286] Change location of libmatthew-java to fedora's mirror. Original one is unreachable --- pkgs/development/libraries/java/libmatthew-java/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 0b77de56987b..3924b0cdc224 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.8.tar.gz; + url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; From ed51045f13a60168c26d557d63e0e9a2830f8927 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 31 Jul 2014 19:12:43 +0200 Subject: [PATCH 179/286] haskell-bencoding: 0.4.3.0 --- .../libraries/haskell/bencoding/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bencoding/default.nix diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix new file mode 100644 index 000000000000..c93def746554 --- /dev/null +++ b/pkgs/development/libraries/haskell/bencoding/default.nix @@ -0,0 +1,15 @@ +{ cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }: + +cabal.mkDerivation (self: { + pname = "bencoding"; + version = "0.4.3.0"; + sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc"; + buildDepends = [ attoparsec deepseq mtl text ]; + testDepends = [ attoparsec hspec QuickCheck ]; + meta = { + homepage = "https://github.com/cobit/bencoding"; + description = "A library for encoding and decoding of BEncode data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 509c2067ec0d..11102c27a590 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -231,6 +231,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in benchpress = callPackage ../development/libraries/haskell/benchpress {}; + bencoding = callPackage ../development/libraries/haskell/bencoding {}; + bert = callPackage ../development/libraries/haskell/bert {}; bifunctors = callPackage ../development/libraries/haskell/bifunctors {}; From 511f41387d612b08bed4577dfe1ddfa817a2d29c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 31 Jul 2014 12:48:24 -0500 Subject: [PATCH 180/286] haskell-haddock: use buildTools, not extraBuildInputs Fixes #2815 --- pkgs/development/tools/documentation/haddock/2.7.2.nix | 2 +- pkgs/development/tools/documentation/haddock/2.9.2.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix index fd31a96b2913..8ceff01aca9d 100644 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self : { version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 name = self.fname; sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; - extraBuildInputs = [alex happy makeWrapper]; + buildTools = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths]; doCheck = false; diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix index fcae14d789e9..05330b700ccb 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self : { version = "2.9.2"; # Haskell Platform 2011.2.0.0 name = self.fname; sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; - extraBuildInputs = [alex happy makeWrapper]; + buildTools = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths xhtml]; doCheck = false; From 584114b697dfb4fd3c248207f7a6e9c8cda3f81a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Jul 2014 20:42:20 +0200 Subject: [PATCH 181/286] rust: Add an alternative package for the master tip based off of pull request #3084 --- pkgs/development/compilers/rust/head.nix | 73 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/rust/head.nix diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/head.nix new file mode 100644 index 000000000000..ad33906ae6e9 --- /dev/null +++ b/pkgs/development/compilers/rust/head.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: + +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +*/ + +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "a5e1bb723020ac35173d49600e76b0935e257a6a" + else if stdenv.system == "x86_64-linux" + then "1a2407df17442d93d1c34c916269a345658045d7" + else if stdenv.system == "i686-darwin" + then "6648fa88e41ad7c0991a085366e36d56005873ca" + else if stdenv.system == "x86_64-darwin" + then "71b2d1dfd0abe1052908dc091e098ed22cf272c6" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-07-17"; + snapshotRev = "9fc8394"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; + + src = fetchgit { + url = https://github.com/rust-lang/rust; + rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65"; + sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + snapshot = stdenv.mkDerivation { + name = "rust-stage0"; + src = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha1 = snapshot; + }; + dontStrip = true; + installPhase = '' + mkdir -p "$out" + cp -r bin "$out/bin" + '' + (if stdenv.isLinux then '' + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ + --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + "$out/bin/rustc" + '' else ""); + }; + + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + + # The compiler requires cc, so we patch the source to tell it where to find it + patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; + postPatch = '' + substituteInPlace src/librustc/back/link.rs \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + ''; + + buildInputs = [ which file perl curl python27 makeWrapper ]; + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d321fd2d802..00335834aca7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3289,7 +3289,8 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - rust = callPackage ../development/compilers/rust {}; + rust = callPackage ../development/compilers/rust {}; + rustMaster = callPackage ../development/compilers/rust/head.nix {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { From 549855113badde8692d84959cc42d8b5cce0f579 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 Jul 2014 22:09:10 +0200 Subject: [PATCH 182/286] modprobe.nix: Use modern environment.etc syntax --- nixos/modules/system/boot/modprobe.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 7b214cd1e1f5..652eb046f50a 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -68,20 +68,15 @@ with lib; config = mkIf (!config.boot.isContainer) { - environment.etc = [ - { source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - target = "modprobe.d/ubuntu.conf"; - } - { source = pkgs.writeText "modprobe.conf" - '' - ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' - blacklist ${name} - '')} - ${config.boot.extraModprobeConfig} - ''; - target = "modprobe.d/nixos.conf"; - } - ]; + environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + + environment.etc."modprobe.d/nixos.conf".text = + '' + ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' + blacklist ${name} + '')} + ${config.boot.extraModprobeConfig} + ''; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; From 1ecfba4391a7f7d7f22c71b688619f1bf576828d Mon Sep 17 00:00:00 2001 From: Blaz Bratanic Date: Fri, 1 Aug 2014 22:41:33 +0200 Subject: [PATCH 183/286] Fixed download path --- pkgs/development/libraries/java/swt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 59f31ac3139a..f64edce7b4c1 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; From befd1289ac91486971d0338053f99419e639b1ca Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Fri, 1 Aug 2014 10:19:00 +1000 Subject: [PATCH 184/286] Updated texlive to latest release --- pkgs/tools/typesetting/tex/texlive/default.nix | 10 +++++----- pkgs/tools/typesetting/tex/texlive/extra.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 94d84fec4cee..b5589cf943b3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2014.20140626"; + texmfVersion = "2014.20140717"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g"; + sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9"; }; - langTexmfVersion = "2014.20140626"; + langTexmfVersion = "2014.20140717"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r"; + sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -120,7 +120,7 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] ++ stdenv.lib.optionals stdenv.isDarwin [ # TODO: We should be able to fix these tests diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index be280c5f4836..4644ee3e50ec 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { name = "texlive-extra-2014"; - version = "2014.20140626"; + version = "2014.20140717"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "1n7n2vssdspzg95qrikl4p8cr6axdpj6bgv2l61px7vp837ma83v"; + sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q"; }; buildInputs = [texLive xz]; @@ -20,7 +20,7 @@ rec { description = "Extra components for TeXLive"; maintainers = [ args.lib.maintainers.raskin ]; - # Actually, arch-independent.. + # Actually, arch-independent.. hydraPlatforms = []; }; } From 641ccec337a701d5236e67a12e97846e52a0e9a2 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 1 Aug 2014 04:28:54 +0200 Subject: [PATCH 185/286] rust: Refer to 0.11.nix directly in all-packages rather than use default.nix indirection --- pkgs/development/compilers/rust/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 pkgs/development/compilers/rust/default.nix diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix deleted file mode 100644 index 6a02145c8f02..000000000000 --- a/pkgs/development/compilers/rust/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./0.11.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00335834aca7..8a2508158437 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3289,7 +3289,7 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - rust = callPackage ../development/compilers/rust {}; + rust = callPackage ../development/compilers/rust/0.11.nix {}; rustMaster = callPackage ../development/compilers/rust/head.nix {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; From 8f763d0539b1f39c6cf3e86f54b2661edeb74ea9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 1 Aug 2014 04:37:07 +0200 Subject: [PATCH 186/286] rustc: rename rust to rustc, but keep rust attr name for backwards compat --- pkgs/development/compilers/{rust => rustc}/0.11.nix | 0 pkgs/development/compilers/{rust => rustc}/common.nix | 2 +- .../compilers/{rust => rustc}/hardcode_paths.patch | 0 pkgs/development/compilers/{rust => rustc}/head.nix | 0 .../compilers/{rust => rustc}/local_stage0.patch | 0 pkgs/top-level/all-packages.nix | 7 +++++-- 6 files changed, 6 insertions(+), 3 deletions(-) rename pkgs/development/compilers/{rust => rustc}/0.11.nix (100%) rename pkgs/development/compilers/{rust => rustc}/common.nix (97%) rename pkgs/development/compilers/{rust => rustc}/hardcode_paths.patch (100%) rename pkgs/development/compilers/{rust => rustc}/head.nix (100%) rename pkgs/development/compilers/{rust => rustc}/local_stage0.patch (100%) diff --git a/pkgs/development/compilers/rust/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix similarity index 100% rename from pkgs/development/compilers/rust/0.11.nix rename to pkgs/development/compilers/rustc/0.11.nix diff --git a/pkgs/development/compilers/rust/common.nix b/pkgs/development/compilers/rustc/common.nix similarity index 97% rename from pkgs/development/compilers/rust/common.nix rename to pkgs/development/compilers/rustc/common.nix index b190b937dda2..7af19a40c790 100644 --- a/pkgs/development/compilers/rust/common.nix +++ b/pkgs/development/compilers/rustc/common.nix @@ -32,5 +32,5 @@ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; - name = "rust-${version}"; + name = "rustc-${version}"; } diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch similarity index 100% rename from pkgs/development/compilers/rust/hardcode_paths.patch rename to pkgs/development/compilers/rustc/hardcode_paths.patch diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rustc/head.nix similarity index 100% rename from pkgs/development/compilers/rust/head.nix rename to pkgs/development/compilers/rustc/head.nix diff --git a/pkgs/development/compilers/rust/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch similarity index 100% rename from pkgs/development/compilers/rust/local_stage0.patch rename to pkgs/development/compilers/rustc/local_stage0.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a2508158437..20cb2cd1cfbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3289,8 +3289,11 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - rust = callPackage ../development/compilers/rust/0.11.nix {}; - rustMaster = callPackage ../development/compilers/rust/head.nix {}; + rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; + + rust = rustc; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { From 6ab0a8d0a8314d005375b6cfb19c56acd9590868 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 30 Jul 2014 04:30:16 +0200 Subject: [PATCH 187/286] perl-packages: Add AnyEvent::I3, version 0.15. This is needed in order to run the i3 test suite. Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8433cec7f7..6ad4379185a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -116,6 +116,19 @@ let self = _self // overrides; _self = with self; { }; }; + AnyEventI3 = buildPerlPackage rec { + name = "AnyEvent-I3-0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + sha256 = "0x8zi06667bdgaxn7driqx0d71mp6021r51hdzmj5m5qbhi2hvqi"; + }; + propagatedBuildInputs = [ AnyEvent JSONXS ]; + meta = { + description = "Communicate with the i3 window manager"; + license = "perl"; + }; + }; + AnyEventRabbitMQ = buildPerlPackage { name = "AnyEvent-RabbitMQ-1.15"; src = fetchurl { From cf6bb72c6a0578e0d3b8e9d65bf9839ef9ef9c37 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 30 Jul 2014 04:32:38 +0200 Subject: [PATCH 188/286] perl-packages: Add X11-XCB and dependencies. This is another requirement for running the i3 test suite. Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 74 ++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ad4379185a1..540a19ca19cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3403,6 +3403,19 @@ let self = _self // overrides; _self = with self; { }; }; + ExtUtilsPkgConfig = buildPerlPackage rec { + name = "ExtUtils-PkgConfig-1.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "1cxh6w8vmyqmhl6afys2q6z6jkp1m6zvacpk70196zmk48p1kcv9"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig ]; + meta = { + description = "Simplistic interface to pkg-config"; + license = licenses.lgpl21Plus; + }; + }; + # From CPAN[1]: # This module exists merely as a compatibility wrapper around # ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to @@ -9603,6 +9616,41 @@ let self = _self // overrides; _self = with self; { doCheck = false; # requires an X server }; + X11XCB = buildPerlPackage rec { + name = "X11-XCB-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + sha256 = "18i3z1fzw76kl9n5driys12r6vhp3r6rmb2pjn5nc7m9n4bwgh38"; + }; + AUTOMATED_TESTING = false; + buildInputs = [ + ExtUtilsDepends ExtUtilsPkgConfig DataDump + XMLSimple XMLDescent TestDeep TestException + pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm + ]; + propagatedBuildInputs = [ XSObjectMagic Mouse TryTiny ]; + NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; + doCheck = false; # requires an X server + meta = { + description = "XCB bindings for X"; + license = "perl"; + }; + }; + + XMLDescent = buildPerlPackage rec { + name = "XML-Descent-1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + sha256 = "0l5xmw2hd95ypppz3lyvp4sn02ccsikzjwacli3ydxfdz1bbh4d7"; + }; + buildInputs = [ TestDifferences ]; + propagatedBuildInputs = [ XMLTokeParser ]; + meta = { + description = "Recursive descent XML parsing"; + license = "perl"; + }; + }; + XMLDOM = buildPerlPackage { name = "XML-DOM-1.44"; src = fetchurl { @@ -9724,6 +9772,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [XMLParser]; }; + XMLTokeParser = buildPerlPackage rec { + name = "XML-TokeParser-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; + sha256 = "1hnpwb3lh6cbgwvjjgqzcp6jm4mp612qn6ili38adc9nhkwv8fc5"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "Simplified interface to XML::Parser"; + license = "perl"; + }; + }; + XMLTwig = buildPerlPackage { name = "XML-Twig-3.44"; src = fetchurl { @@ -9742,6 +9803,19 @@ let self = _self // overrides; _self = with self; { }; }; + XSObjectMagic = buildPerlPackage rec { + name = "XS-Object-Magic-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; + }; + buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; + meta = { + description = "XS pointer backed objects using sv_magic"; + license = "perl"; + }; + }; + YAML = buildPerlPackage { name = "YAML-0.90"; src = fetchurl { From d49f15251304056a1a4136572916fba7fe7a302f Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 30 Jul 2014 04:36:22 +0200 Subject: [PATCH 189/286] perl-packages: Update Inline to version 0.64. Also tested whether all references (InlineJava, Autodia) are built successfully. Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 540a19ca19cb..86190f7fb35a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4584,13 +4584,14 @@ let self = _self // overrides; _self = with self; { }; Inline = buildPerlPackage rec { - name = "Inline-0.45"; + name = "Inline-0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SISYPHUS/${name}.tar.gz"; - sha256 = "1k5nrb3nh2y33bs944ri78m1ni60v4cl67ffhxx88azj542y5c9x"; + url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; + sha256 = "17n3gbc9jigpfwqfhgmxpvbgr9rkdrij8jayxqpzw611ixcxrplw"; }; + buildInputs = [ TestWarn ]; propagatedBuildInputs = [ ParseRecDescent ]; meta = { From 4a412e9561daf76fda8028f1d9ea68cfa79758ff Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:07:20 +0200 Subject: [PATCH 190/286] perl-packages: Update Any-Moose to version 0.24. This has required to update a few dependencies, including Mouse (to version 2.3.0). Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 59 ++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86190f7fb35a..f93f65d46be8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -146,12 +146,12 @@ let self = _self // overrides; _self = with self; { }; AnyMoose = buildPerlPackage rec { - name = "Any-Moose-0.10"; + name = "Any-Moose-0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SARTAK/${name}.tar.gz"; - sha256 = "1kgksln1vykh0xynawv3pc3nw1yp7kjwbxbb5lh2hm21a4l4h61x"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "0g4w11chpnspnksw80jbdn5wp2m5hqzcyjzcy2hsjz9rkk2ncdbk"; }; - propagatedBuildInputs = [Mouse]; + propagatedBuildInputs = [ Mouse ]; }; ApacheLogFormatCompiler = buildPerlModule { @@ -1840,6 +1840,18 @@ let self = _self // overrides; _self = with self; { makeMakerFlags = "--lib=${pkgs.openssl}/lib"; }; + CwdGuard = buildPerlModule rec { + name = "Cwd-Guard-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + sha256 = "071k50n1yr48122jjjg50i1s2kwp06dmrisv35f3wjry8m6cqchm"; + }; + meta = { + description = "Temporary changing working directory (chdir)"; + license = "perl"; + }; + }; + DataClone = buildPerlPackage { name = "Data-Clone-0.003"; src = fetchurl { @@ -5377,6 +5389,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; }; + ModuleBuildXSUtil = buildPerlModule rec { + name = "Module-Build-XSUtil-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; + sha256 = "1323vxp8vf5xdz66lbc1wfciaks93mrbqfsjgb9nz1w9bb21xj36"; + }; + buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; + meta = { + description = "A Module::Build class for building XS modules"; + license = "perl"; + }; + }; + ModuleCoreList = buildPerlPackage { name = "Module-CoreList-3.01"; src = fetchurl { @@ -6183,14 +6208,16 @@ let self = _self // overrides; _self = with self; { }; }; - Mouse = buildPerlPackage rec { - name = "Mouse-0.26"; + Mouse = buildPerlModule rec { + name = "Mouse-2.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "0dpf5qmf1vc8dq5nj6yiriz8v4wl8s9g519v1hnz4yf11n2lnr4x"; + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "0ycl521mmc5989934502730rzsi9xqihdpnjihrkhflqmrzmaqwq"; }; - propagatedBuildInputs = [TestException]; - doCheck = false; # check can't find its own Mouse::Tiny module + buildInputs = [ + ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput + TestFatal + ]; }; MozillaCA = buildPerlPackage { @@ -8452,6 +8479,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestLeakTrace = buildPerlPackage rec { + name = "Test-LeakTrace-0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "06cn4g35l2gi9vbsdi2j49cxsji9fvfi7xp4xgdyxxds9vrxydia"; + }; + meta = { + description = "Traces memory leaks"; + license = "perl"; + }; + }; + TestLongString = buildPerlPackage rec { name = "Test-LongString-0.15"; src = fetchurl { From 8851638ea7b7156b587686139ff784e5e466bb32 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:11:16 +0200 Subject: [PATCH 191/286] perl-packages: Add new package CarpAlways, v0.13. This has been proven to be VERY handy for providing useful stacktraces in Perl. Just invoke it using: perl -MCarp::Always yourshinyscript.pl Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f93f65d46be8..6d12eb7de1f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -569,6 +569,18 @@ let self = _self // overrides; _self = with self; { }; }; + CarpAlways = buildPerlPackage rec { + name = "Carp-Always-0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + sha256 = "0i2rifkr7ybfcdsqana52487z7vxp2l5qdra0f6ik0ddhn6rzii1"; + }; + meta = { + description = "Warns and dies noisily with stack backtraces"; + license = "perl"; + }; + }; + CarpAssert = buildPerlPackage { name = "Carp-Assert-0.20"; src = fetchurl { From dff91a009de9135657ef99c7d36fbf66848b3085 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:13:54 +0200 Subject: [PATCH 192/286] perl-packages: Add new package MouseXNativeTraits. This is actually needed by X11-XCB, but I only found out after hours of digging through Perl code from the stone age. Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d12eb7de1f5..0d7b798d5bee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6232,6 +6232,20 @@ let self = _self // overrides; _self = with self; { ]; }; + MouseXNativeTraits = buildPerlPackage rec { + name = "MouseX-NativeTraits-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ AnyMoose ]; + meta = { + description = "Extend attribute interfaces for Mouse"; + license = "perl"; + }; + }; + MozillaCA = buildPerlPackage { name = "Mozilla-CA-20130114"; src = fetchurl { From bae7da07d8baf5ce63cacc79cabc07a7268b0716 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:15:43 +0200 Subject: [PATCH 193/286] perl-packages: Add MouseXNativeTraits to X11-XCB. Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d7b798d5bee..ed9e5d298607 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9694,7 +9694,7 @@ let self = _self // overrides; _self = with self; { XMLSimple XMLDescent TestDeep TestException pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ]; - propagatedBuildInputs = [ XSObjectMagic Mouse TryTiny ]; + propagatedBuildInputs = [ XSObjectMagic Mouse MouseXNativeTraits TryTiny ]; NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; doCheck = false; # requires an X server meta = { From b02d72f754248c89323e79d88d570e054bdd062a Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:16:20 +0200 Subject: [PATCH 194/286] perl-packages: Add new package Inline-C, v0.62. This is needed for running the test suite of the i3 window manager. Signed-off-by: aszlig --- pkgs/top-level/perl-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed9e5d298607..eb0bd52dbead 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4634,6 +4634,28 @@ let self = _self // overrides; _self = with self; { }; }; + InlineC = buildPerlPackage rec { + name = "Inline-C-0.62"; + + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; + sha256 = "0clggdpj5mmi35vm2991f9jsgv2a3s8r4f1bd88xxk8akv5b8i3r"; + }; + + postPatch = '' + # this test will fail with chroot builds + rm -f t/08taint.t + ''; + + buildInputs = [ TestWarn FileCopyRecursive ]; + propagatedBuildInputs = [ Inline ]; + + meta = { + description = "Write Perl Subroutines in C"; + license = "perl"; + }; + }; + InlineJava = buildPerlPackage rec { name = "Inline-Java-0.52"; From feeb5bae2317e054eb307f6c998058eea8ae9fcd Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:17:23 +0200 Subject: [PATCH 195/286] Add new package xdummy, a dummy X server. This is actually a small script which just starts an X server without any real display. Right now only needed for running the test suite of the i3 window manager within the Nix chroot, but might be useful for running other tests needing a DISPLAY. Usage is just like a regular X server, so in order to start an instance for display :666, you just run it like this: xdummy :666 Signed-off-by: aszlig --- pkgs/tools/misc/xdummy/default.nix | 83 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/tools/misc/xdummy/default.nix diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix new file mode 100644 index 000000000000..30aba19930c7 --- /dev/null +++ b/pkgs/tools/misc/xdummy/default.nix @@ -0,0 +1,83 @@ +{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config }: + +let + xorgConfig = writeText "dummy-xorg.conf" '' + Section "ServerLayout" + Identifier "dummy_layout" + Screen 0 "dummy_screen" + InputDevice "dummy_keyboard" "CoreKeyboard" + InputDevice "dummy_mouse" "CorePointer" + EndSection + + Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" + EndSection + + Section "Files" + ModulePath "${xorg.xorgserver}/lib/xorg/modules" + ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" + XkbDir "${xkeyboard_config}/share/X11/xkb" + FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" + FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + EndSection + + Section "Module" + Load "dbe" + Load "extmod" + Load "freetype" + Load "glx" + EndSection + + Section "InputDevice" + Identifier "dummy_mouse" + Driver "void" + EndSection + + Section "InputDevice" + Identifier "dummy_keyboard" + Driver "void" + EndSection + + Section "Monitor" + Identifier "dummy_monitor" + HorizSync 30.0 - 130.0 + VertRefresh 50.0 - 250.0 + Option "DPMS" + EndSection + + Section "Device" + Identifier "dummy_device" + Driver "dummy" + VideoRam 192000 + EndSection + + Section "Screen" + Identifier "dummy_screen" + Device "dummy_device" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Depth 24 + Modes "1280x1024" + EndSubSection + EndSection + ''; + +in writeScriptBin "xdummy" '' + #!${stdenv.shell} + export XKB_BINDIR="${xorg.xkbcomp}/bin" + exec ${xorg.xorgserver}/bin/Xorg \ + -noreset \ + -logfile /dev/null \ + "$@" \ + -config "${xorgConfig}" +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0093566949e1..b56e7659ca71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2454,6 +2454,8 @@ let xdelta = callPackage ../tools/compression/xdelta { }; + xdummy = callPackage ../tools/misc/xdummy { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { From 2c1d04a563c0e5bd5ff6256e5bd716ebaa72512d Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:22:08 +0200 Subject: [PATCH 196/286] i3: Enable running test suite by default. Finally, after going through the journey of debugging and gathering dependencies, we now have tests for i3, hooray! Signed-off-by: aszlig --- .../window-managers/i3/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 17a287f8aae2..56b11df72e23 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, - xcb-util-cursor, coreutils, perl, pango }: + xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -11,13 +11,25 @@ stdenv.mkDerivation rec { sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango ]; + buildInputs = [ + which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + perlPackages.CarpAlways + ]; patchPhase = '' patchShebangs . ''; + doCheck = true; + + checkPhase = '' + ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy + (cd testcases && perl complete-run.pl) + ''; + configurePhase = "makeFlags=PREFIX=$out"; meta = with stdenv.lib; { From 31e77f5096fe8bce81d4d520cee9ccac9b81d7f0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 05:45:14 +0200 Subject: [PATCH 197/286] i3: Abort build if test suite is failing. The exit code of the i3 test runner is always 0, regardless of whether tests were failing or not, so let's quickly grep for a "not ok" in the test logfile and if it occurs, the whole build is failing now. Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 56b11df72e23..38e6b63dd5e4 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { checkPhase = '' ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy (cd testcases && perl complete-run.pl) + ! grep -q '^not ok' testcases/latest/complete-run.log ''; configurePhase = "makeFlags=PREFIX=$out"; From fb1f257189e1b743edcfb0868187474149e5e86e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 08:04:09 +0200 Subject: [PATCH 198/286] i3: Don't run test cases in parallel. Unfortunately, running them in parallel sometimes lead to tests not even starting up. Probably lock contention is the issue here, but haven't investigated further so I'm deactivating parallel testing. Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 38e6b63dd5e4..1a5137fb4721 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { checkPhase = '' ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy - (cd testcases && perl complete-run.pl) + (cd testcases && perl complete-run.pl -p 1) ! grep -q '^not ok' testcases/latest/complete-run.log ''; From 81f258e7bfd5b65424fd25a10d1378600924960c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Aug 2014 09:42:37 +0200 Subject: [PATCH 199/286] merlin: some cleaning of the derivation --- pkgs/development/tools/ocaml/merlin/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index a5a06f37c9c1..c0882439f5c5 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,15 +1,10 @@ {stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: -let - pname = "merlin"; - version = "1.6"; - webpage = "http://the-lambda-church.github.io/merlin/"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "merlin-1.6"; src = fetchurl { - url = "https://github.com/the-lambda-church/${pname}/archive/v${version}.tar.gz"; + url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; }; @@ -19,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "An editor-independant tool to ease the developpement of programs in OCaml"; - homepage = "${webpage}"; + homepage = "http://the-lambda-church.github.io/merlin/"; license = stdenv.lib.licenses.mit; }; } From c92a8584ee958c99a05303cf66e82face7625c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 1 Aug 2014 10:04:08 +0200 Subject: [PATCH 200/286] fix eval after cf6bb72c6 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eb0bd52dbead..ae06d55caf11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3436,7 +3436,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.pkgconfig ]; meta = { description = "Simplistic interface to pkg-config"; - license = licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; }; }; From e27dcfff1b108227bc96ad7678bdf1861a7adf71 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Fri, 1 Aug 2014 16:52:19 +0800 Subject: [PATCH 201/286] Allows the JDK to be chosen in services.tomcat --- nixos/modules/services/web-servers/tomcat.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 1de3d40165e9..16958f24030a 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -77,6 +77,11 @@ in description = "Whether to enable logging per virtual host."; }; + jdk = mkOption { + default = pkgs.jdk; + description "Which JDK to use."; + } + axis2 = { enable = mkOption { @@ -332,13 +337,13 @@ in ''; script = '' - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' ''; postStop = '' echo "Stopping tomcat..." - CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh + CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh ''; }; From bb153cfe72e16abc7118d1e9994a4e6d20fe8fc7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 Aug 2014 11:16:39 +0200 Subject: [PATCH 202/286] calibre: update from 1.46.0 to 1.47.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 764145e39d65..03faaa9ada4b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.46.0"; + name = "calibre-1.47.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1mzw6cmnw1wk8jd2pkl6z7bgjhwn4j7lg0a33f07gk4xw94sbry2"; + sha256 = "1hmqynxh9h12whcjwcd5idgc6mdaggczsf4hm70ajhj7pfjp3szg"; }; inherit python; From 32d7c4c435cdda284bccd4f024c2c4a80ec48217 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 11:16:57 +0200 Subject: [PATCH 203/286] i3: Remove CarpAlways from buildInputs. Oops, it was a leftover from debugging. Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 1a5137fb4721..ecb04c4db7b7 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC - perlPackages.CarpAlways ]; patchPhase = '' From 3566807e76748cbf52d8fa6eafad9485b55a11f5 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 1 Aug 2014 15:25:50 +0200 Subject: [PATCH 204/286] Google Compute image: Removed the 'wait for GCE metadata service' job, as it was causing issues with the metadata service (likely some firewall or something). In stead, use wget with retries (including connection refused) in stead or curl for fetching the SSH keys. Also made the stdout/-err of this job appear in the console. --- .../virtualisation/google-compute-image.nix | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 9a4d11d550a1..697423ac60be 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -121,19 +121,6 @@ in networking.usePredictableInterfaceNames = false; - systemd.services.wait-metadata-online = { - description = "Wait for GCE metadata server to become reachable"; - wantedBy = [ "network-online.target" ]; - before = [ "network-online.target" ]; - path = [ pkgs.netcat ]; - script = '' - # wait for the metadata server to become available for up to 60 seconds - for counter in {1..30}; do sleep 2 && nc -vzw 2 metadata 80 && break; done - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - }; - systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -142,14 +129,15 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; - path = [ pkgs.curl ]; + path = [ pkgs.wget ]; script = '' + wget="wget --retry-connrefused -t 6 --waitretry=10" # Don't download the SSH key if it has already been downloaded if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -p /root/.ssh - curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys + $wget -O /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then @@ -162,7 +150,7 @@ in fi echo "obtaining SSH private host key..." - curl -o /root/ssh_host_ecdsa_key --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key + $wget -O /root/ssh_host_ecdsa_key http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key ]; then mv -f /root/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key echo "downloaded ssh_host_ecdsa_key" @@ -170,7 +158,7 @@ in fi echo "obtaining SSH public host key..." - curl -o /root/ssh_host_ecdsa_key.pub --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub + $wget -O /root/ssh_host_ecdsa_key.pub http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key.pub ]; then mv -f /root/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub echo "downloaded ssh_host_ecdsa_key.pub" @@ -179,7 +167,7 @@ in ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + serviceConfig.StandardError = "journal+console"; + serviceConfig.StandardOutput = "journal+console"; }; - - } From 688824cc60838c504eb7ea7ac47e9cfbc38e13d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Aug 2014 16:11:03 +0200 Subject: [PATCH 205/286] Add a bunch of Hydra dependencies to the channel --- pkgs/top-level/perl-packages.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae06d55caf11..59da67e5294e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -637,6 +637,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Automated REST Method Dispatching"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -804,6 +805,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Request logging from within Catalyst"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -841,6 +843,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -885,6 +888,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession GDSecurityImage HTTPDate ]; meta = { description = "Create and validate Captcha for Catalyst"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -944,6 +948,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestMockObject ]; propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { @@ -954,6 +961,9 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; CatalystPluginStackTrace = buildPerlPackage { @@ -1004,6 +1014,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "JSON view for your data"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -1017,6 +1028,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Template View Class"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -3114,6 +3126,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0ffmpqys7yph5lb28m2xan0zd837vywg8c6gjjd9p80dahpqknyx"; }; propagatedBuildInputs = [EmailSimple EmailAddress ModulePluggable ReturnValue]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; EmailSender = buildPerlPackage { @@ -3755,6 +3770,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4426,6 +4442,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; doCheck = !stdenv.isDarwin; }; @@ -4557,6 +4574,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4755,6 +4773,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CommonSense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + platforms = stdenv.lib.platforms.linux; }; }; @@ -5035,6 +5054,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "The World-Wide Web library for Perl"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -5064,6 +5084,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Provide https support for LWP::UserAgent"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -7270,6 +7291,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k"; }; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; ReadonlyXS = buildPerlPackage rec { @@ -7606,6 +7630,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; SQLTokenizer = buildPerlPackage rec { @@ -8097,6 +8124,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0hy1225zg2yg11xhgj0wbiapzjyf6slx17ln36zqvfm07k6widlx"; }; doCheck = false; # no `hostname' in stdenv + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; TAPParserSourceHandlerpgTAP = buildPerlModule { @@ -9159,6 +9189,7 @@ let self = _self // overrides; _self = with self; { homepage = http://www.shlomifish.org/open-source/projects/docmake/; description = "Organize Data in Tables"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; }; From 5e35fef0eb7f303f2589f1dc48f297ea2c2767fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 1 Aug 2014 13:50:09 +0200 Subject: [PATCH 206/286] freecad: updating to 0.14 I had to update all the pyside programs, or freecad failed to build. I picked the versions advertised in http://qt-project.org/wiki/PySideDownloads . The rest I took for github latest releases. --- pkgs/applications/graphics/freecad/default.nix | 10 +++++----- .../python-modules/pyside/apiextractor.nix | 11 +++++------ pkgs/development/python-modules/pyside/default.nix | 11 +++++------ .../python-modules/pyside/generatorrunner.nix | 11 +++++------ pkgs/development/python-modules/pyside/shiboken.nix | 11 +++++------ pkgs/development/python-modules/pyside/tools.nix | 11 +++++------ 6 files changed, 30 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 770a7ee8212b..2f20291e2703 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts , boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper -, matplotlib, pycollada }: +, matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.13.1830"; + version = "0.14.3702"; src = fetchurl { url = "mirror://sourceforge/free-cad/${name}.tar.gz"; - sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; + sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib - pycollada + pycollada pyside pysideShiboken ]; enableParallelBuilding = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./pythonpath.patch ./cmake.patch ]; + patches = [ ./pythonpath.patch ]; meta = { homepage = http://free-cad.sourceforge.net/; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 107bb08759fb..e3bcf059c1c2 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-apiextractor-0.10.7-6-gdcb1195"; + name = "pyside-apiextractor-0.10.10"; - src = fetchgit { - url = "git://github.com/PySide/Apiextractor.git"; - rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b"; - sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274"; + src = fetchurl { + url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; + sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index dc4f733a4cf0..d274283594ab 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: stdenv.mkDerivation { - name = "pyside-1.0.9"; + name = "pyside-1.2.2"; - src = fetchgit { - url = "git://github.com/PySide/PySide.git"; - rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de"; - sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515"; + src = fetchurl { + url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2"; + sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 12ec5a7ef51b..2423cbb0c2e4 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.15"; + name = "pyside-generatorrunner-0.6.16"; - src = fetchgit { - url = "git://github.com/PySide/Generatorrunner.git"; - rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535"; - sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74"; + src = fetchurl { + url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; + sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index d8ef2d7b52f1..5e266aba7d0d 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-shiboken-1.0.7-73-g9f110f8"; + name = "pyside-shiboken-1.2.2"; - src = fetchgit { - url = "git://github.com/PySide/Shiboken.git"; - rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7"; - sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd"; + src = fetchurl { + url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2"; + sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a3153bed2177..b5ddec09c03e 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }: +{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "pyside-tools-0.2.13"; + name = "pyside-tools-0.2.15"; - src = fetchgit { - url = "git://github.com/PySide/Tools.git"; - rev = "23e0712360442e50f34be0d6e4651b8c4c806d47"; - sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07"; + src = fetchurl { + url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; + sha256 = "0x4z3aq7jgar74gxzwznl3agla9i1dcskw5gh11jnnwwn63ffzwa"; }; enableParallelBuilding = true; From 00b63f66551e0b224bb4d883203bb92652235396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 1 Aug 2014 16:55:23 +0200 Subject: [PATCH 207/286] Update mumble to 1.2.7. (Chery picked from release-14.04) --- pkgs/applications/networking/mumble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 0f2a3d93cdbc..7b9396ff5ffb 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mumble-" + version; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://sourceforge/mumble/${name}.tar.gz"; - sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47"; + sha256 = "0zjqkkdkcvgmqic6np87hj6b6f851lkzyd6y3cqj6zzacjvps31d"; }; patches = optional jackSupport ./mumble-jack-support.patch; From 64561b437d78e03c3854fddc8587d6ceb21a02f2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 1 Aug 2014 17:18:27 +0200 Subject: [PATCH 208/286] Remove broken flag for xen, build with gcc45. --- pkgs/applications/virtualization/xen/default.nix | 1 - pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 5f149b059787..3cb16a6b4425 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -136,6 +136,5 @@ stdenv.mkDerivation { description = "Xen hypervisor and management tools for Dom0"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2210ccb4488e..b6d5c5a024bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10033,7 +10033,9 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { }; + xen = callPackage ../applications/virtualization/xen { + stdenv = overrideGCC stdenv gcc45; + }; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; From 5a918f5f5cfe30cf10698e8b7cd38498828398b3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 1 Aug 2014 18:34:18 +0200 Subject: [PATCH 209/286] Add experimental link to proxy to page that does wireless distributions of IPA files --- pkgs/development/mobile/xcodeenv/build-app.nix | 12 ++++++++++++ .../mobile/xcodeenv/install.html.template | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/mobile/xcodeenv/install.html.template diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b5766c805522..92e68f1bda70 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -15,9 +15,15 @@ , provisioningProfile ? null , generateIPA ? false , generateXCArchive ? false +, enableWirelessDistribution ? false +, installURL ? null +, bundleId ? null +, version ? null +, title ? null }: assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; +assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; let # Set some default values here @@ -84,6 +90,12 @@ stdenv.mkDerivation { # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname=$(basename $out/*.ipa .ipa) + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html + echo "doc install $out/$appname.html" >> $out/nix-support/hydra-build-products + ''} ''} # Delete our temp keychain diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template new file mode 100644 index 000000000000..b7c6a9fe6627 --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/install.html.template @@ -0,0 +1,11 @@ + + + + + Install IPA + + + + + + From 3d34dc39ac7092ba8754637059a63ca4f4899e9e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Aug 2014 18:40:19 +0200 Subject: [PATCH 210/286] i3: Only enable tests for x86_64-linux. Right now, tests for i686-linux fail, see: https://hydra.nixos.org/build/13024964 Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index ecb04c4db7b7..536f76dbc501 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - doCheck = true; + doCheck = stdenv.system == "x86_64-linux"; checkPhase = '' ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy From b0769d8db1b25676765f93cea1de95365767d224 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 1 Aug 2014 19:26:34 +0200 Subject: [PATCH 211/286] Use hyperlink and click action instead of meta refresh --- .../mobile/xcodeenv/install.html.template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template index b7c6a9fe6627..833b1994162c 100644 --- a/pkgs/development/mobile/xcodeenv/install.html.template +++ b/pkgs/development/mobile/xcodeenv/install.html.template @@ -3,9 +3,23 @@ Install IPA - + Go to the install page or wait a second + + From b0c8769c848e90a3561424dd9d3ed08faf9ce85f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Aug 2014 15:14:38 -0400 Subject: [PATCH 212/286] Add tornadokick python package --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee29b74f72e5..066821a71f37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9026,6 +9026,24 @@ rec { }; + tornadokick = buildPythonPackage rec { + name = "tornadokick-2014.07.23"; + + propagatedBuildInputs = [ tornado ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; + md5 = "201d26de2993a554b16140af3b4ee1b6"; + }; + + meta = { + description = "The TornadoKick Web Toolkit for Tornado Web Framework."; + homepage = http://github.com/multoncore/tornadokick; + license = stdenv.lib.licenses.asl20; + }; + }; + + tarman = buildPythonPackage rec { version = "0.1.3"; name = "tarman-${version}"; From 7fec5759763580226711451165ae68de1edf16e9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Aug 2014 16:23:56 -0400 Subject: [PATCH 213/286] Fix lib functions taken from pkgs.lib instead of lib in nixos --- .../services/web-servers/apache-httpd/tomcat-connector.nix | 2 +- nixos/modules/services/x11/desktop-managers/e18.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix index d4165c8c5bac..a883bb2b3433 100644 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix @@ -31,7 +31,7 @@ in { options = { - extraWorkersProperties = pkgs.lib.mkOption { + extraWorkersProperties = lib.mkOption { default = ""; description = "Additional configuration for the workers.properties file."; }; diff --git a/nixos/modules/services/x11/desktop-managers/e18.nix b/nixos/modules/services/x11/desktop-managers/e18.nix index cb717eea909c..faafd21b07dd 100644 --- a/nixos/modules/services/x11/desktop-managers/e18.nix +++ b/nixos/modules/services/x11/desktop-managers/e18.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let From fb565f1a4ea2a71debe48e206ef6c2d032bba0a3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Aug 2014 17:55:37 -0400 Subject: [PATCH 214/286] amazon-image.nix: Overwrite busybox swapon --- nixos/modules/virtualisation/amazon-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 7d6109f212ac..e129e496fe36 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -172,7 +172,7 @@ in boot.initrd.extraUtilsCommands = '' # We need swapon in the initrd. - cp ${pkgs.utillinux}/sbin/swapon $out/bin + cp --remove-destination ${pkgs.utillinux}/sbin/swapon $out/bin ''; # Don't put old configurations in the GRUB menu. The user has no From f681a7683cde7a5c3725523898b7ca20d13bfa8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Aug 2014 04:31:26 +0200 Subject: [PATCH 215/286] poppler: maintenance update --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index fd507b3e5406..1345ce37e775 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.26.2"; # even major numbers are stable - sha256 = "09lm1mfpf0p6vzayl2nbwvsj5gl7sz8sfmwziix0p87bh8x9dn8x"; + version = "0.26.3"; # even major numbers are stable + sha256 = "1ca2lrwvhxzq0g4blbvq099vyydfjyz839jki301p1jgazrimjw8"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.24 From 3a6135a907bd8de3c29925dc92c441161bc992b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Aug 2014 04:31:51 +0200 Subject: [PATCH 216/286] harfbuzz: small update --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 89c6b9651616..8340660e3923 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.32"; + name = "harfbuzz-0.9.33"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "1d4x9fcy2p9g67pb4nfzx6p4008dzn7g25lva9pv71rd9rs82323"; + sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk"; }; configureFlags = [ From 9fcd3c2825ad0bea017dd6e95f49c616a13eef2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Aug 2014 04:43:11 +0200 Subject: [PATCH 217/286] libdrm: update --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 69d09fe9fae4..d7a6f8d54430 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.54"; + name = "libdrm-2.4.56"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1sg45y9yiz9yyp6dkyilqz8rhii9azgy53i2s4iia3p8zgmh2h6r"; + sha256 = "0c20wpfa94d8kww0f2xinmm4axsl4nhq921xj4i88yhpjbhbn3z2"; }; nativeBuildInputs = [ pkgconfig ]; From 91b53aaebc0ca2e80d073459324515879e300f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Aug 2014 04:43:19 +0200 Subject: [PATCH 218/286] xorg.libXext: minor update --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 938f6564b52a..2f18a4e1020f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -680,11 +680,11 @@ let })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.3.2"; + name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2; - sha256 = "1q1j0kjyhmy24wqr6mdkrrciffyqhmc8vn95za2w1ka6qrdhfagq"; + url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; + sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 2b17423bae2d..417d12ddadc9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -66,7 +66,7 @@ mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 -mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 From a1e392267d9d324362de7558b3d4a46125d96fd7 Mon Sep 17 00:00:00 2001 From: System administrator Date: Sat, 2 Aug 2014 09:20:49 +0200 Subject: [PATCH 219/286] fix download url --- pkgs/development/libraries/lightning/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 2a77c8e0623c..951627c81c2f 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lightning-2.0.4"; src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/lightning/${name}.tar.gz"; + url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz"; sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy"; }; From 4d6503e5b51b34b8f1603d5078b0c897a693f912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Jul 2014 09:57:16 +0200 Subject: [PATCH 220/286] blender: fix parallel builds (cherry picked from commits f63fb3fda0200754 + 5fa61a29048115b21) --- pkgs/applications/misc/blender/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 13d0bfa7a423..a31fcfeab0f4 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew +{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 ''; + patches = [(fetchpatch { # fix parallel builds + url = "https://developer.blender.org/D619?download=true"; + sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f"; + name = "D619.diff"; + })]; + patchFlags = "-p0"; + cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF" From 664a4cb18f1170b9f359684b3e19721a80264482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:24:56 +0200 Subject: [PATCH 221/286] drumkv1: update from 0.4.2 to 0.5.0 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 34950d1a343d..775cf5ca606c 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; + sha256 = "16bjkp22hfpmzj5di98dddzslavgvhw5z7pgjzmjqz9dxvbqwq1k"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; From 49f26425f9509055e477056839b3d751ed37a87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:30:33 +0200 Subject: [PATCH 222/286] synthv1: update from 0.4.2 to 0.5.0 --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 08c13243804b..c6c464b9ad70 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; + sha256 = "011kjccrdwb62rpck5gb8h4kvvm8rk6n77lj78ykxz4pxip5hf14"; }; buildInputs = [ qt4 jack2 lv2 ]; From b67c9785407b0cf5cd8337f167980916e430ccec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:30:46 +0200 Subject: [PATCH 223/286] samplv1: update from 0.4.2 to 0.5.0 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 7d8d5fc04abc..0cbdfa6973db 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; + sha256 = "02mm5y1yzklvs5bpxl86y3dqcg7migfybmin8llk91pws6rl9b41"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; From e29021d502ce981da4d02542c7a6032bb0e125a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:30:57 +0200 Subject: [PATCH 224/286] qtractor: update from 0.6.1 to 0.6.2 --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index e589adc0e417..4177dbeeb0cb 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc"; + sha256 = "08cr4lgm8bkkmsvfljszcqij3i52n989s7ncrbrn17n61rmgf8yw"; }; buildInputs = From 2702cedb53a475c4fadc102f7b697b8728774acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:31:30 +0200 Subject: [PATCH 225/286] yoshimi: update from 1.2.0 to 1.2.2 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 497ab3ac78d6..91142691055b 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx"; + sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c"; }; buildInputs = [ From c5788e6fd46e46984a016539a03f3f7845692e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:32:00 +0200 Subject: [PATCH 226/286] xf86_input_wacom: update from 0.23.0 to 0.25.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e59fd695f780..d4786037b5af 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.23.0"; + name = "xf86-input-wacom-0.25.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "13capyywk4k3z0va8dawvvdbyschwid0075ji67kyabz1y431h6v"; + sha256 = "06kwcxmgja0xwc5glzwmxm237bsv9fk52k2d6ffq4naqfzn2k31k"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender From d4fb2e83db495764ad0d5ac55fc7144628bca6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 2 Aug 2014 11:33:06 +0200 Subject: [PATCH 227/286] kde4_next.kde_wacomtablet: update from 2.0 to 2.0.2, potentially fixes CVE-2012-4514, CVE-2012-4514 --- pkgs/applications/misc/kde-wacomtablet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 3e652c717ec4..ee93f57eafcd 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-2.0"; + name = "wacomtablet-2.0.2"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2"; - sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz"; + sha256 = "13k5f5xpka5cbgl24a3j9khqcmp96x1vhynn9v558ag6dg9ch2hw"; }; buildInputs = [ kdelibs xf86_input_wacom ]; From 6aabd17d5135c37c582dedab383ddefef03f6d00 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 2 Aug 2014 17:20:57 +0200 Subject: [PATCH 228/286] i3: Don't override patchPhase. Makes easier to provide a patches attribute through packageOverrides. Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 536f76dbc501..b5869ccaf8d9 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC ]; - patchPhase = '' + postPatch = '' patchShebangs . ''; From a54b012fe913011f5dd4d6613be45378144f03bf Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 2 Aug 2014 18:55:38 +0200 Subject: [PATCH 229/286] youtube-dl: update to 2014.08.02.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1a99cb291c47..64cfadb494a3 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.04.02"; + version = "2014.08.02.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1c9d5wjl0aaqfvz868wbkr3dwby9vjkx0hkbnwx0wnpg48nlnwpm"; + sha256 = "0pn8vfzsxp0qbjidhi6pwr1cfinqbr9wcr7sipr97j4ja9m5kkha"; }; buildInputs = [ python ]; From 6f98561c1a831b5fa4d92e1d12c41d4e70ef96db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 2 Aug 2014 20:21:03 +0200 Subject: [PATCH 230/286] qtcreator: install documentation qtcreator displays an error when accessing help, unless we have installed documentation. That seems like a packaging bug to me and is definitely unfriendly (default) behaviour. This change increases the closure size from 56 MiB to 68 MiB. --- pkgs/development/qtcreator/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 2b0410f0874e..fd4483dbd6c2 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtLib, sdkBuild ? false }: +{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }: with stdenv.lib; @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro ''; - installFlags = "INSTALL_ROOT=$(out)"; + buildFlags = optionalString withDocumentation " docs"; + + installFlags = "INSTALL_ROOT=$(out)" + + optionalString withDocumentation " install_docs"; meta = { description = "Cross-platform IDE tailored to the needs of Qt developers"; From b4df21469bedaa2b2543048beac00409a32ed809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 2 Aug 2014 20:37:39 +0200 Subject: [PATCH 231/286] qtcreator: install desktop file --- pkgs/development/qtcreator/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index fd4483dbd6c2..dec94a912e00 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -41,6 +41,21 @@ stdenv.mkDerivation rec { installFlags = "INSTALL_ROOT=$(out)" + optionalString withDocumentation " install_docs"; + postInstall = '' + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/qtcreator.desktop" << __EOF__ + [Desktop Entry] + Exec=$out/bin/qtcreator + Name=Qt Creator + GenericName=Cross-platform IDE for Qt + Icon=QtProject-qtcreator.png + Terminal=false + Type=Application + Categories=Qt;Development;IDE; + __EOF__ + ''; + meta = { description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' From ae11e5994922cd511a27f0e60f81f8c0193986ee Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 Aug 2014 17:56:53 -0500 Subject: [PATCH 232/286] kernel: 3.4.100 -> 3.4.101 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index dcdb4af2dce8..6a232d6450b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.100"; + version = "3.4.101"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "170q4ay8kxf45b3932fpms37w4fh9h7pdiwc5wr64drg5j356pds"; + sha256 = "1zmb3dzqjiwb9ckj0gqqvlpdvqrjw17z9sddzxyawfrag6xv24a7"; }; kernelPatches = args.kernelPatches ++ From 89d56556704a53d33005b94ca998417b53cb3c79 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 Aug 2014 17:58:31 -0500 Subject: [PATCH 233/286] kernel: 3.10.50 -> 3.10.51 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 8780057da025..26938b715783 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.50"; + version = "3.10.51"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ay7hscaa4nyvpa4l10y8himyj5fp25n63nxvrccqqqir3b8l1gz"; + sha256 = "1z1sbk13f5njbmx7vi775i2pp79f6b5r39cp85yzz0byvn6lx885"; }; features.iwlwifi = true; From eb9ee180d9888cdb48772fb6511107ab56d956f9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 Aug 2014 17:59:20 -0500 Subject: [PATCH 234/286] kernel: 3.12.25 -> 3.12.26 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 2035eef93211..291e43a98e58 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.25"; + version = "3.12.26"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "16jdqhhi7z6jkprz90cb48cd479zsqlrn9j3yp2xcyqp05nc7n2p"; + sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c"; }; features.iwlwifi = true; From 63cc1fd8ad7d5da5ff638ccce9795b9a15741366 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 Aug 2014 18:02:15 -0500 Subject: [PATCH 235/286] kernel: 3.14.14 -> 3.14.15 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 4983dd0a16fc..2d53d06f755c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.14"; + version = "3.14.15"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0w9qp0jmfsrg9msgi6ab39kbz69id3xwnqvlgd9k4v6ka5bk7062"; + sha256 = "0wjws67s698zpjj0kd3sxakjvnls91kc6vvz0md4i0qg683ld790"; }; features.iwlwifi = true; From 317d4253eae8ddc8195d986b8d5a65f193ac1062 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 Aug 2014 18:04:08 -0500 Subject: [PATCH 236/286] kernel: 3.15.7 -> 3.15.8 --- pkgs/os-specific/linux/kernel/linux-3.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 86f03da4228d..b59baf9f669c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15.7"; + version = "3.15.8"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "034q34gib9jqfiydnqf5i827ns07apmkh2j48vbakdwydvzzv6fj"; + sha256 = "012d793mg2lkxfs6rxqkl22p6899l620ssbsii1szfjhnynh1qjd"; }; features.iwlwifi = true; From 7a4a1320859b3e4ba302b36b005b4aec1977dbc1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 3 Aug 2014 09:55:56 +0200 Subject: [PATCH 237/286] Revert "gnome-shell: enable parallel building" This reverts commit 9ec0a105d31391fad2e7a3d86fd6ca78a2036fae. Conflicts: pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix --- pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix index 2fb1e091aa0e..9663d1317622 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -43,8 +43,6 @@ stdenv.mkDerivation rec { echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; - enableParallelBuilding = true; - passthru = { mozillaPlugin = "/lib/mozilla/plugins"; }; From cc3b5291d9519141efcb8437d57a85d5bba00586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 Aug 2014 11:44:41 +0200 Subject: [PATCH 238/286] shotcut: update from 14.07 to 14.08 --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 97c3720f7f93..3f324480c8ab 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "14.07"; + version = "14.08"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "05g0b3jhmmdv8qnlgmi8wsfi7l3c5zvjcrrb3q7ajfc3q7yf6k6a"; + sha256 = "0klcvpgp2l6xcdjy1gg7a5s8mx0mm347zdf26q6kk685pldlvkyj"; }; buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; From 4143d9dfefc208944faa1edc8dd3c17a874b5da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 Aug 2014 11:46:08 +0200 Subject: [PATCH 239/286] shotcut: remove obsolete patch --- pkgs/applications/video/shotcut/CuteLogger.patch | 13 ------------- pkgs/applications/video/shotcut/default.nix | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/video/shotcut/CuteLogger.patch diff --git a/pkgs/applications/video/shotcut/CuteLogger.patch b/pkgs/applications/video/shotcut/CuteLogger.patch deleted file mode 100644 index 77b451cb437d..000000000000 --- a/pkgs/applications/video/shotcut/CuteLogger.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git shotcut-14.07/CuteLogger/CuteLogger.pro shotcut-14.07/CuteLogger/CuteLogger.pro -index 501eddc..a5290b0 100644 ---- shotcut-14.07/CuteLogger/CuteLogger.pro -+++ shotcut-14.07/CuteLogger/CuteLogger.pro -@@ -42,7 +42,7 @@ unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { -- target.path = /usr/lib -+ target.path = $(INSTALL_ROOT)/usr/lib - } - INSTALLS += target - } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3f324480c8ab..51baa32f61e8 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; - # Fixed in git and can be removed for the next release - patches = [ ./CuteLogger.patch ]; - configurePhase = "qmake PREFIX=$out"; postInstall = '' From 92f7908d5b74354a25e0c11637fed6489f4c61f1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 13:21:08 +0200 Subject: [PATCH 240/286] yajl: name of downloaded tarbal should be the same as derivation name --- pkgs/development/libraries/yajl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index afcbcafab118..2014d597d749 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://github.com/lloyd/yajl/tarball/2.0.4; - name = "yajl-2.0.1.tar.gz"; + name = "${name}.tar.gz"; sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; }; From 335575a51ed9b1f58de3a0258e10a26a47b6b59b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 13:22:06 +0200 Subject: [PATCH 241/286] geoclue: update to 2.1.9 --- pkgs/development/libraries/geoclue/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 3932fa945c8c..5ab9cb62443d 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.1.8"; + name = "geoclue-2.1.9"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; - sha256 = "05h102110gsxxvmvllssfz7ldjpwrrb5sqg5rbpibys6iy4w1k6m"; + sha256 = "0aq9fqlvvc8jqbshp3mbcc1j5hq4fzjy8hd1yxcl6xrd0jkfw5ml"; }; buildInputs = From 5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 3 Aug 2014 12:02:27 +0200 Subject: [PATCH 242/286] freecad: small cleanup * FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency * cmake.patch is not used anymore, remove it * License is now only LGPLv2+ (since v0.14) * Homepage moved to http://www.freecadweb.org/ Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014 --- .../applications/graphics/freecad/cmake.patch | 32 ------------------- .../applications/graphics/freecad/default.nix | 14 ++++---- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/graphics/freecad/cmake.patch diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch deleted file mode 100644 index 62efaf1e29dc..000000000000 --- a/pkgs/applications/graphics/freecad/cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake ---- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200 -@@ -201,7 +201,7 @@ - #endmacro(fc_add_resources) - - MACRO (fc_add_resources outfiles ) -- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN}) - - FOREACH (it ${rcc_files}) - GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt ---- freecad-0.13.1830.old/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/CMakeLists.txt 2014-04-20 10:28:41.782536753 +0200 -@@ -314,14 +314,14 @@ - macro(fc_wrap_cpp outfiles ) - # get include dirs - QT4_GET_MOC_FLAGS(moc_flags) -- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) - # fixes bug 0000585: bug with boost 1.48 - SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) - QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) -- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "") - set(${outfiles} ${${outfiles}} ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 2f20291e2703..a7665177046b 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper +, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper , matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib + zlib python swig gfortran soqt libf2c makeWrapper matplotlib pycollada pyside pysideShiboken ]; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { patches = [ ./pythonpath.patch ]; - meta = { - homepage = http://free-cad.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" ]; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://www.freecadweb.org/; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } From 77389a5bcb3fe5a4699d306da35463c007274143 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 15:59:13 +0400 Subject: [PATCH 243/286] Update LiquidWar6 to 0.4 --- pkgs/games/liquidwar/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 292aa2ff1904..cd7478d99c8d 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -6,16 +6,16 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis - libXrender + libogg libvorbis csound + libXrender libcaca cunit ]; in rec { - name = "liquidwar6-0.0.13beta"; + name = "liquidwar6-${meta.version}"; src = a.fetchurl { url = "mirror://gnu/liquidwar6/${name}.tar.gz"; - sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2"; + sha256 = "1q58liqm5cgp494yjj6rfc2xj5b4gm8r8yvi46jzwqll353mabwl"; }; inherit buildInputs; @@ -35,5 +35,8 @@ rec { ]; platforms = with a.lib.platforms; linux; + homepage = "http://www.gnu.org/software/liquidwar6/"; + version = "0.4.3681"; + updateWalker=true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 538a5ee72425..7626338db00e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5641,7 +5641,7 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis + libogg libvorbis libcaca csound cunit ; guile = guile_1_8; libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 From 9d38aa6591e5486746031ce9b034f672b380c85a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 13:23:20 +0200 Subject: [PATCH 244/286] girara: update to 0.2.2 --- pkgs/applications/misc/girara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4db4e4b10916..b25d347ec873 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.2.0"; + name = "girara-0.2.2"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi"; + sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3"; }; buildInputs = [ pkgconfig gtk gettext ]; From 3bf7d7c42a7c5f6039982e948f67772d33e55f3f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 13:24:29 +0200 Subject: [PATCH 245/286] i3lock: update to 2.6 --- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index c37ed0d85f27..5af4519af03a 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-2.5"; + name = "i3lock-2.6"; src = fetchurl { url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "0xqdklvfcn2accwdbzsly7add0f3rh9sxjnahawas4zwwk4p49xc"; + sha256 = "0aj0an8fwv66jhda499r3xa00546cc9ja1dk8xpc6sy6xygqjbf0"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 From 16ae8c3e8474cef78f4be91cc87c43ff29df5bf1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 13:32:34 +0200 Subject: [PATCH 246/286] zathura: update to 0.2.9 --- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 933882c940bb..5cffbe965bbb 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { - version = "0.2.7"; + version = "0.2.9"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf"; + sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; From 14f93004025da3e607c202d50de03739f0fdd3ae Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 14:03:36 +0200 Subject: [PATCH 247/286] notmuch: update to 0.18.1 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 3c7cfde231ab..7a1eddfa8690 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.17"; + name = "notmuch-0.18.1"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "15dypk2damyvxgfc8dy6iiky1ayxnj5samd4v300pi9nwpky05fj"; + sha256 = "1pdp9l7yv71d3fjb30qyccva8h03hvg88q4a00yi50v2j70kvmgj"; }; buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; From 0b299403a6796ec21f3ccebc3e47afb7b454826c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 14:03:56 +0200 Subject: [PATCH 248/286] msmtp: update to 1.4.32 --- pkgs/applications/networking/msmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 584fdcd170a7..2b42a275d8c7 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }: stdenv.mkDerivation rec { - name = "msmtp-1.4.31"; + name = "msmtp-1.4.32"; src = fetchurl { url = "mirror://sourceforge/msmtp/${name}.tar.bz2"; - sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4"; + sha256 = "122z38pv4q03w3mbnhrhg4w85a51258sfdg2ips0b6cgwz3wbw1b"; }; buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]; From 4c659bafa38f014ff07644a83706836647ce2edc Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 14:37:39 +0200 Subject: [PATCH 249/286] weechatDevel: update to latest --- pkgs/applications/networking/irc/weechat/devel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index 25cc8dd76603..34ca4b4d7c6e 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "70d2b0ad8eb7854932d24c007a05b8627f751205"; + rev = "124b2668fe4e97e3926caea85ed2c9f7082c4df9"; version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i"; + sha256 = "1xl5scyrxmyqaycpalhl3j50s65w2gjdm43vahd618yyykdffr8b"; }; buildInputs = From a9df9c702d509c435dabe1fdd3b55cdf671da4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 Aug 2014 14:27:03 +0200 Subject: [PATCH 250/286] dcraw: update from 9.20 to 9.22 --- pkgs/tools/graphics/dcraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index ed9ac2da2d2a..124c5bcda64f 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.20"; + name = "dcraw-9.22"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "151xpfmfd1ksjcnpmsnxry1mf2xpx9iaiy9sg1vxgm9i80lkkp5f"; + sha256 = "0wjs90xdzdxi51qikbvc66gb912k2ay7jn9b31wv4rxxzgnbk4cs"; }; buildInputs = [ libjpeg lcms gettext jasper ]; From 928f293e6e5fc4a90d95958c286168ea2a1e89b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 Aug 2014 14:38:43 +0200 Subject: [PATCH 251/286] dcraw: fix build, now requires lcms2 --- pkgs/tools/graphics/dcraw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 124c5bcda64f..b8d8dd5f48ad 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: stdenv.mkDerivation rec { name = "dcraw-9.22"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "0wjs90xdzdxi51qikbvc66gb912k2ay7jn9b31wv4rxxzgnbk4cs"; + sha256 = "00dz85fr5r9k3nlwdbdi30fpqr8wihamzpyair7l7zk0vkrax402"; }; - buildInputs = [ libjpeg lcms gettext jasper ]; + buildInputs = [ libjpeg lcms2 gettext jasper ]; patchPhase = '' sed -i -e s@/usr/local@$out@ install From aff65bbb57611a962c5e719201971a405cea9988 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Aug 2014 15:16:38 +0200 Subject: [PATCH 252/286] yajl: fix evaluation --- pkgs/development/libraries/yajl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 2014d597d749..079b457ab1fe 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, ruby }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "yajl-2.0.4"; src = fetchurl { From 9d3fbcd05435411e49e588fb4b23b32856549831 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 3 Aug 2014 16:09:45 +0200 Subject: [PATCH 253/286] tomcat: Fix evaluation after e27dcff. Signed-off-by: aszlig --- nixos/modules/services/web-servers/tomcat.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 16958f24030a..c2f464014ae6 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -79,8 +79,8 @@ in jdk = mkOption { default = pkgs.jdk; - description "Which JDK to use."; - } + description = "Which JDK to use."; + }; axis2 = { From 97a1b91f1b7bd5eeac13ddca3f5be08cac3085b6 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Sun, 3 Aug 2014 15:03:07 +0200 Subject: [PATCH 254/286] libid3tag: move pkgconfig file into the nix-expression directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn Forsman: * use "mkdir -p" instead of "ensureDir" (deprecated) * place *.pc file in $out/lib/pkgconfig/ (instead of $out/share/pkgconfig/ which doesn't work) * prefix commit message with "libid3tag:" ] --- .../libraries/libid3tag/default.nix | 24 +++++-------------- .../development/libraries/libid3tag/id3tag.pc | 11 +++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/libraries/libid3tag/id3tag.pc diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index a173cee2f264..4cc2f65440ca 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -14,24 +14,12 @@ stdenv.mkDerivation rec { patches = [ ./debian-patches.patch ]; - postInstall = let pkgconfigFile = writeText "id3tag.pc" '' - prefix=@out@ - exec_prefix=''${prefix} - libdir=''${exec_prefix}/lib - includedir=''${exec_prefix}/include - - Name: libid3tag - Description: ID3 tag manipulation library - Version: ${version} - - Libs: -L''${libdir} -lid3tag - Cflags: -I''${includedir} - ''; - in '' - ensureDir $out/share/pkgconfig - cp ${pkgconfigFile} $out/share/pkgconfig/id3tag.pc - substituteInPlace $out/share/pkgconfig/id3tag.pc \ - --subst-var-by out $out + postInstall = '' + mkdir -p $out/lib/pkgconfig + cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc + substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + --subst-var-by out $out \ + --subst-var-by version "${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc new file mode 100644 index 000000000000..854f1783cae5 --- /dev/null +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -0,0 +1,11 @@ +prefix=@out@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${exec_prefix}/include + +Name: libid3tag +Description: ID3 tag manipulation library +Version: @version@ + +Libs: -L${libdir} -lid3tag +Cflags: -I${includedir} From 367718a80f100d9ec34186763edb57f8f0b99e1c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 3 Aug 2014 16:33:19 +0200 Subject: [PATCH 255/286] libxkbcommon: Update to version 0.4.2. Fixes build of i3lock and to possibly prevent breakage of other packages, I've tested building of gtk3 and qt5 (partial, core2duo here). I know it's not a comprehensive test but we can still revert in case Hydra reports more builds failing. Signed-off-by: aszlig --- pkgs/development/libraries/libxkbcommon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index e7923f3df5bc..e5682219dba1 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }: +{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.3.1"; + name = "libxkbcommon-0.4.2"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww"; + sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50"; }; - buildInputs = [ pkgconfig yacc flex xkeyboard_config ]; + buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; configureFlags = '' --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb From 10f9730d64329772d720d1f2b5e728f3db7d0f6a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:35:51 +0400 Subject: [PATCH 256/286] Update compiz --- pkgs/applications/window-managers/compiz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 02b7b9987bdb..b73d636aaa58 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.10.0"; + version="0.9.11.2"; name="${baseName}-${version}"; - hash="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax"; - url="https://launchpad.net/compiz/0.9.10/0.9.10.0/+download/compiz-0.9.10.0.tar.bz2"; - sha256="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax"; + hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; + url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2"; + sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo From 399c5285ec3c594274f97b395d6609bad83d0d1c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:36:35 +0400 Subject: [PATCH 257/286] Update Angelscript --- pkgs/development/interpreters/angelscript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 871101ba03e0..1167f121e624 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version = "2.29.0"; + version = "2.29.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx"; + sha256 = "081a0wnn1hl0hjgrg0nz63ff7k7dgrwsgszka5i7623ny407fkl5"; }; in rec { From 9695af7d47fc0f181ec8e057bd26a786f740813a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:38:03 +0400 Subject: [PATCH 258/286] Update libSodium cryptography library --- pkgs/development/libraries/sodium/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 93f2ff0de6b6..be52725f2c8f 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="0.5.0"; + version="0.6.1"; name="${baseName}-${version}"; - hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz"; - sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; + hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz"; + sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; }; buildInputs = [ ]; From 4c176fd76ed0c6dc59411b080f56b3aff7ed0bd4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:44:33 +0400 Subject: [PATCH 259/286] Update Scons build manager --- pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 75d72e3d52a0..93f7699481c8 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.1"; + version = "2.3.2"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9"; + sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr"; }; buildInputs = [python makeWrapper]; From 20028936abdd12951629563232df59d6c98eb45c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:46:18 +0400 Subject: [PATCH 260/286] Update ZPAQ --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 718a80e1406a..1ed5866a6920 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="652"; + version="655"; name="${baseName}-${version}"; - hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; - url="http://mattmahoney.net/dc/zpaq652.zip"; - sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; + hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; + url="http://mattmahoney.net/dc/zpaq655.zip"; + sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; }; buildInputs = [ unzip From 619c368f54820d040e74dca8541f40455fdfcb0a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:53:00 +0400 Subject: [PATCH 261/286] Update Sysdig system tracing tool --- pkgs/os-specific/linux/sysdig/default.nix | 5 +++-- pkgs/os-specific/linux/sysdig/default.upstream | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 10a1d88f2347..e9b533f66876 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version="0.1.83"; + version = "0.1.86"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r"; + sha256 = "1bb5whzxmbzr21fxirymhznkgdx01rsqzxd2dlnqvhbf8x2dpzw3"; }; buildInputs = [ cmake zlib luajit @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [maintainers.raskin]; platforms = platforms.linux ++ platforms.darwin; + downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/pkgs/os-specific/linux/sysdig/default.upstream index 7071d9825007..485de5741d79 100644 --- a/pkgs/os-specific/linux/sysdig/default.upstream +++ b/pkgs/os-specific/linux/sysdig/default.upstream @@ -1,3 +1,8 @@ url https://github.com/draios/sysdig/releases ensure_choice version '.*/([0-9.]+)[.]tar[.].*' '\1' +do_overwrite () { + ensure_hash + set_var_value sha256 $CURRENT_HASH + set_var_value version $CURRENT_VERSION +} From 06ee6a2dab04ce2fef4b64c2e5482041bb2f956f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 20:54:31 +0400 Subject: [PATCH 262/286] Update GNU Chess chess engine --- pkgs/games/gnuchess/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 72270cc312a2..90a4a069c2ae 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.1.1"; + version="6.1.2"; name="${baseName}-${version}"; - hash="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; - url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.1.tar.gz"; - sha256="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; + hash="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l"; + url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.2.tar.gz"; + sha256="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l"; }; buildInputs = [ flex From 1fa783f55a6259c300b87762f7b8786fe1645800 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 22:02:29 +0400 Subject: [PATCH 263/286] Update glusterfs --- pkgs/tools/filesystems/glusterfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 1c843a666360..69f3f7ef1efd 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,10 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.5.0"; + version="3.5.2"; name="${baseName}-${version}"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz"; - sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir"; + hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz"; + sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline From 750a5f4e0cedc414826c10db24f84c72c03a143e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 22:02:52 +0400 Subject: [PATCH 264/286] Update Wine-unstable --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 0e19d6ab8932..bcfc1600be40 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.20"; + version = "1.7.23"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "05azpxrl7364ckvkwy7aa2p0vb4qhbc6wcn2l8khqb92jq5inhww"; + sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v"; }; gecko = fetchurl { From 09b3fd0eb280b4157bc5eb0e28e9304ca383df41 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 22:18:53 +0400 Subject: [PATCH 265/286] Update SBCL Common Lisp compiler --- pkgs/development/compilers/sbcl/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 579d5ec11eb9..6872fee846f3 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2; - sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + sha256 = "08jk1bjk7087gq4ibzs1d27r0c6pigbvmff351j9a03kvl652b2v"; }; - buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp; + buildInputs = [ ] + ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) + ++ (stdenv.lib.optional stdenv.isLinux clisp) + ; patchPhase = '' echo '"${version}.nixos"' > version.lisp-expr @@ -70,5 +73,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; + inherit version; + updateWalker = true; }; } From 0ca8dfe8052b03eb53f24ee19472c54ce3c6439b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 3 Aug 2014 22:19:27 +0400 Subject: [PATCH 266/286] Remove SBCL updater file: home page allows automatic updates --- pkgs/development/compilers/sbcl/default.upstream | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 pkgs/development/compilers/sbcl/default.upstream diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream deleted file mode 100644 index de69a2828c61..000000000000 --- a/pkgs/development/compilers/sbcl/default.upstream +++ /dev/null @@ -1,9 +0,0 @@ -name sbcl -target default.nix -url http://sf.net/projects/sbcl/files/sbcl/ -version_link '/sbcl/[0-9.]+/$' -link "source.tar.bz2" -version '.*/sbcl-([0-9.]+)-source.*' '\1' -redirect -process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' -process '[?].*' '' From 34890e7c2a825d0d43dc4d6d070d706181ae8374 Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Tue, 20 May 2014 10:50:39 +0100 Subject: [PATCH 267/286] nixos: Add enablePHP convinence option to services.httpd module to mimic subservices option Fixes #2699 --- .../modules/services/web-servers/apache-httpd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6d0416fbb155..eb3cb75b658e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -387,7 +387,7 @@ let ''; - enablePHP = any (svc: svc.enablePHP) allSubservices; + enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; # Generate the PHP configuration file. Should probably be factored @@ -531,6 +531,12 @@ in ''; }; + enablePHP = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the PHP module."; + }; + phpOptions = mkOption { type = types.lines; default = ""; From 4b052cb8469d98b568c8580cdab90069912fa168 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 21:33:37 +0200 Subject: [PATCH 268/286] zathura: preBuild phase not needed in latest zathura --- pkgs/applications/misc/zathura/core/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 5cffbe965bbb..5f44f79ebcdd 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -11,13 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; - # Bug in zathura build system: we should remove empty manfiles in order them - # to be compiled properly - preBuild = '' - rm zathura.1 - rm zathurarc.5 - ''; - makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; postInstall = '' From d8fa02b508fd5fa0ce375bafced4df5c33be1976 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Aug 2014 21:46:36 +0200 Subject: [PATCH 269/286] synergy: update to 1.5.0 --- pkgs/applications/misc/synergy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 834b514148b6..4e0efc5f3e5f 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.4.17"; + name = "synergy-1.5.0"; src = fetchurl { - url = "http://fossfiles.com/synergy/${name}-r2055-Source.tar.gz"; - sha256 = "1mwaapvq9vsm0rdpq99fyzcw6wbp83rg6cylcqcgjjd21c6y9iwm"; + url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz"; + sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6"; }; patches = optional stdenv.isLinux ./cryptopp.patch; From 65949e7415adc3c49d24a56b70dfcd06e1fd7736 Mon Sep 17 00:00:00 2001 From: cbpark Date: Mon, 4 Aug 2014 00:58:17 +0200 Subject: [PATCH 270/286] Add haskell-probability --- .../libraries/haskell/probability/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/probability/default.nix diff --git a/pkgs/development/libraries/haskell/probability/default.nix b/pkgs/development/libraries/haskell/probability/default.nix new file mode 100644 index 000000000000..bada700ca3d3 --- /dev/null +++ b/pkgs/development/libraries/haskell/probability/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, random, transformers, utilityHt }: + +cabal.mkDerivation (self: { + pname = "probability"; + version = "0.2.4.1"; + sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc"; + buildDepends = [ random transformers utilityHt ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; + description = "Probabilistic Functional Programming"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 11102c27a590..49f3e1a07c7e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1867,6 +1867,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; primitive = self.primitive_0_5_3_0; + probability = callPackage ../development/libraries/haskell/probability {}; + profunctors = callPackage ../development/libraries/haskell/profunctors {}; profunctorExtras = callPackage ../development/libraries/haskell/profunctor-extras {}; From 8f3d2b740bebfb0efb3ee4773a068b296015f3d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Aug 2014 01:08:48 +0200 Subject: [PATCH 271/286] wine: Update to 1.7.23 --- pkgs/misc/emulators/wine/unstable.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index bcfc1600be40..cd5c5a8b4790 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -16,18 +16,18 @@ let }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; - sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi"; + sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f"; }; gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; - sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi"; + sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7"; }; mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; - sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi"; + sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr"; }; in stdenv.mkDerivation rec { From 4834717507640831a3770cb8b946d26d6fbdc49f Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Aug 2014 02:38:03 +0200 Subject: [PATCH 272/286] linux-kernel: Add new upstream version 3.16. Also set linux_latest to it as well. Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/linux-3.16.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.16.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix new file mode 100644 index 000000000000..3a7e51a080e5 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.16"; + modDirVersion = "3.16.0"; + extraMeta.branch = "3.16"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "183p3pz2rfprbp5i4kwk90kjn90v40banwx8759jxnd74xwss4s8"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7626338db00e..7cbee0a724ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7373,6 +7373,15 @@ let ]; }; + linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7508,8 +7517,8 @@ let linuxPackages = linuxPackages_3_12; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_15; - linuxPackages_latest = pkgs.linuxPackages_3_15; + linux_latest = pkgs.linux_3_16; + linuxPackages_latest = pkgs.linuxPackages_3_16; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -7521,6 +7530,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); + linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors From 26440f41fb6072a11d1aeeee870179747e064d61 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Aug 2014 04:07:23 +0200 Subject: [PATCH 273/286] chromium: Update beta and dev to latest versions. beta: 37.0.2062.44 -> 37.0.2062.58 (builds fine, tested) dev: 38.0.2101.0 -> 38.0.2107.3 (builds fine, tested) Drop patch for fixing angle build for the dev version, because it was applied upstream already. Signed-off-by: aszlig --- .../chromium/source/angle_build_37.patch | 347 ------------------ .../browsers/chromium/source/default.nix | 6 +- .../browsers/chromium/source/sources.nix | 16 +- 3 files changed, 10 insertions(+), 359 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch deleted file mode 100644 index a3e8c91174a4..000000000000 --- a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch +++ /dev/null @@ -1,347 +0,0 @@ -commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3 -Author: Jamie Madill -Date: Thu Jun 12 13:41:17 2014 -0400 - - Use commit_id.py on Windows, and handle missing git. - - This allows us to delete the Windows batch file. - - Changes the commit_id script to take the working directory so that it - can be called from a different working directory than the angle - repository is in. - - Renames the generated commit header to angle_commit.h. This is being - written to the shared generated code directory for the entire build, - and "commit.h" is insufficiently unique. - - BUG=angle:669 - - Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3 - Reviewed-on: https://chromium-review.googlesource.com/202048 - Reviewed-by: Geoff Lang - Tested-by: Jamie Madill - [Removed and/or fixed up Windows specific hunks] - Signed-off-by: aszlig - -diff --git a/generate_projects b/generate_projects -index 6743254..8175277 100644 ---- a/generate_projects -+++ b/generate_projects -@@ -34,6 +34,7 @@ if __name__ == '__main__': - gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') - gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') - gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false') -+ gyp_cmd += ' -D angle_use_commit_id=0' - gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') - - print 'Generating projects to ' + generation_dir + ' from gyp files...' -diff --git a/projects/build/all.sln b/projects/build/all.sln -index 1aa0796..5862edd 100644 ---- a/projects/build/all.sln -+++ b/projects/build/all.sln -@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}" - ProjectSection(ProjectDependencies) = postProject - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} - {276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6} - {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679} - {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} -+ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061} -@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048 - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln -index 53cec34..b927860 100644 ---- a/projects/samples/samples.sln -+++ b/projects/samples/samples.sln -@@ -1,9 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 - # Visual C++ Express 2010 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/projects/src/angle.sln b/projects/src/angle.sln -index 0d6ec65..cdf9f53 100644 ---- a/projects/src/angle.sln -+++ b/projects/src/angle.sln -@@ -1,9 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 - # Visual C++ Express 2010 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/src/angle.gypi b/src/angle.gypi -index 5339369..ef16749 100644 ---- a/src/angle.gypi -+++ b/src/angle.gypi -@@ -7,6 +7,12 @@ - { - 'angle_code': 1, - 'angle_post_build_script%': 0, -+ 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle', -+ 'angle_id_script_base': 'commit_id.py', -+ 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)', -+ 'angle_id_header_base': 'commit.h', -+ 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)', -+ 'angle_use_commit_id%': ' (checks if git is present) -+# Usage: commit_id.py gen (generates commit id) - -+def grab_output(command, cwd): -+ return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip() -+ -+operation = sys.argv[1] -+cwd = sys.argv[2] -+ -+if operation == 'check': -+ index_path = os.path.join(cwd, '.git', 'index') -+ if os.path.exists(index_path): -+ print("1") -+ else: -+ print("0") -+ sys.exit(0) -+ -+output_file = sys.argv[3] - commit_id_size = 12 - - try: -- commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD') -- commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD') -+ commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd) -+ commit_date = grab_output('git show -s --format=%ci HEAD', cwd) - except: - commit_id = 'invalid-hash' - commit_date = 'invalid-date' - --hfile = open(sys.argv[1], 'w') -+hfile = open(output_file, 'w') - - hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id) - hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size) -diff --git a/src/common/version.h b/src/common/version.h -index b9781d7..d9148d1 100644 ---- a/src/common/version.h -+++ b/src/common/version.h -@@ -1,4 +1,4 @@ --#include "commit.h" -+#include "id/commit.h" - - #define ANGLE_MAJOR_VERSION 2 - #define ANGLE_MINOR_VERSION 1 -diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp -index 8525ffb..e3ffa47 100644 ---- a/src/libGLESv2/ProgramBinary.cpp -+++ b/src/libGLESv2/ProgramBinary.cpp -@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade - - bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) - { -+#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD -+ return false; -+#else - BinaryInputStream stream(binary, length); - - int format = stream.readInt(); -@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) - initializeUniformStorage(); - - return true; -+#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD - } - - bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 70b01d071a78..c075cc36f166 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -30,14 +30,12 @@ stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi - '' + optionalString (versionOlder version "38.0.0.0") ('' + '' + optionalString (versionOlder version "38.0.0.0") '' sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/preprocessor.pm - '' + optionalString (!versionOlder version "37.0.0.0") '' - patch -p1 -d third_party/angle < "${./angle_build_37.patch}" - '') + optionalString useOpenSSL '' + '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 294577aa5594..4a610827913f 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,16 +1,16 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "38.0.2101.0"; - sha256 = "01lmnw6kf7qahifybpcf7275ilbsdz1mg10lckh9jhbqk4mxy4c4"; - sha256bin32 = "06grj03bvkgfmr5gfhv5gqn9vrz0r37svp5wr0l7d2iav7vk7g9g"; - sha256bin64 = "0d856xkjpx1pcwrkfqa40kwy3s1nvc2qksvrvvdfb84fg3gc4j42"; + version = "38.0.2107.3"; + sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v"; + sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv"; + sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh"; }; beta = { - version = "37.0.2062.44"; - sha256 = "0pvwdrwygn236bg8wdambwkw9iglq0a3lm8sr7k3q02ng5v0l111"; - sha256bin32 = "1j326kgng245b1lf5dlg0ipwbrm7miiz5byhisqls30v1q3njka9"; - sha256bin64 = "1w86salg04z42c518v6nn40003zhabk33plrz5zh9nfjdxn6nxig"; + version = "37.0.2062.58"; + sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl"; + sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk"; + sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi"; }; stable = { version = "36.0.1985.125"; From f40fc0624d22dd4dc5c7e0ec99ec611be33c9d41 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Aug 2014 07:21:27 +0200 Subject: [PATCH 274/286] haskell/yi: Build against vty 4.7.5. Probably jailbreak would do as well, but the version constraints are: vty >= 4.7.4 && <5 I suppose the upcoming release of Yi will fix this, so I'm not using jailbreak here (apart from the fact that Yi doesn't build successfully using VTY >= 5). Thanks to @bb010g for reporting. Signed-off-by: aszlig --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 11102c27a590..8aadcc0a467b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2887,7 +2887,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in taffybar = callPackage ../applications/misc/taffybar {}; - yi = callPackage ../applications/editors/yi/yi.nix {}; + yi = callPackage ../applications/editors/yi/yi.nix { + vty = self.vty_4_7_5; + }; yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; From ba6c76f264066dfaeb0c0ecd3b5dab571f63bd13 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 4 Aug 2014 10:11:52 +0200 Subject: [PATCH 275/286] pythonPackage.gunicorn: update to 19.1.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 066821a71f37..31f0875b5f27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3593,11 +3593,11 @@ rec { }; gunicorn = buildPythonPackage rec { - name = "gunicorn-18.0"; + name = "gunicorn-19.1.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz"; - md5 = "c7138b9ac7515a42066922d2b6120fbe"; + md5 = "3d759bec3c46a680ff010775258c4c56"; }; buildInputs = [ pytest ]; From bffdf03e4fab412b6e4a1e5497349f89a194f07f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Aug 2014 11:23:25 +0200 Subject: [PATCH 276/286] Support app names with white spaces --- pkgs/development/mobile/xcodeenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 92e68f1bda70..1b4940b0c3d9 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString enableWirelessDistribution '' appname=$(basename $out/*.ipa .ipa) sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html - echo "doc install $out/$appname.html" >> $out/nix-support/hydra-build-products + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} ''} From 7eb93f944b3c3f57369d9efdba0c8eef8f89e866 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Aug 2014 11:26:14 +0200 Subject: [PATCH 277/286] Implemented wireless adhoc distribution support for titanium apps --- pkgs/development/mobile/titaniumenv/build-app.nix | 11 +++++++++++ .../mobile/titaniumenv/examples/default.nix | 2 ++ .../titaniumenv/examples/kitchensink/default.nix | 2 ++ 3 files changed, 15 insertions(+) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 2443bfe9aed8..fa959035a9e9 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -2,10 +2,12 @@ { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, enableWirelessDistribution ? false, installURL ? null }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null; +assert enableWirelessDistribution -> installURL != null; let androidsdkComposition = androidsdk { @@ -132,6 +134,15 @@ stdenv.mkDerivation { cp -av build/iphone/build/* $out mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname=$(basename $out/Release-iphoneos/*.ipa .ipa) + bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') + version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') + + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} '' else if target == "iphone" then "" else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index e5b439364535..d595db408178 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -5,6 +5,7 @@ , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false +, enableWirelessDistribution ? false, installURL ? null }: let @@ -90,6 +91,7 @@ rec { release = true; rename = true; inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit enableWirelessDistribution installURL; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 1725c826a52a..953726709694 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,6 @@ { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null +, enableWirelessDistribution ? false, installURL ? null }: assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null); @@ -37,4 +38,5 @@ titaniumenv.buildApp { androidKeyStorePassword = "mykeystore"; inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit enableWirelessDistribution installURL; } From 1501536dcd35b96ebf7aa71bb9f4bd919da068ee Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Mon, 4 Aug 2014 18:21:25 +0800 Subject: [PATCH 278/286] Adding Haskell Package AD for automatic differentiation --- .../libraries/haskell/ad/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ad/default.nix diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix new file mode 100644 index 000000000000..39c17de2c313 --- /dev/null +++ b/pkgs/development/libraries/haskell/ad/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl +, nats, reflection, tagged, transformers +}: + +cabal.mkDerivation (self: { + pname = "ad"; + version = "4.2.0.1"; + sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz"; + buildDepends = [ + comonad dataReify erf free mtl nats reflection tagged transformers + ]; + testDepends = [ doctest filepath mtl ]; + meta = { + homepage = "http://github.com/ekmett/ad"; + description = "Automatic Differentiation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 11102c27a590..05c3dc7d4f4c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,6 +135,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in abstractPar = callPackage ../development/libraries/haskell/abstract-par {}; + ad = callPackage ../development/libraries/haskell/ad {}; + adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; AES = callPackage ../development/libraries/haskell/AES {}; From ea448e90c392e8b7d2d4e4c713b000ac4310b5bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Aug 2014 13:03:25 +0200 Subject: [PATCH 279/286] povray: update to version 3.7 Committed on behalf of Thomas Strobel . --- pkgs/tools/graphics/povray/default.nix | 38 +++++++++++++++++++------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 6272bdae7803..b4a1d1a7d67a 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,21 +1,39 @@ -{stdenv, fetchurl}: +{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}: +let boost = boost149; in stdenv.mkDerivation { - name = "povray-3.6"; + name = "povray-3.7"; - src = fetchurl { - url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2; - sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73"; + src = fetchgit { + url = "https://github.com/POV-Ray/povray.git"; + rev = "39ce8a24e50651904010dda15872d63be15d7c37"; + sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20"; }; + + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ]; + # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out - patchPhase = '' - sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}; + postPatch = '' cd unix + ./prebuild.sh + cd .. + sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} + sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} + sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} + sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} + ''; + + configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include"; + + preInstall = '' + mkdir "$TMP/bin" + for i in chown chgrp; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done ''; - # I didn't use configureFlags because I couldn't pass the quotes properly - # for the COMPILED_BY. - configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\""; meta = { homepage = http://www.povray.org/; From 36d339b74eef6a094fd6f3426eccdc1618598eb1 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Mon, 4 Aug 2014 13:11:29 +0200 Subject: [PATCH 280/286] added paperkey package --- pkgs/tools/security/paperkey/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/paperkey/default.nix diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix new file mode 100644 index 000000000000..c3b1d64c3a3e --- /dev/null +++ b/pkgs/tools/security/paperkey/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + + version = "1.3"; + name = "paperkey-${version}"; + + src = fetchurl { + url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Store OpenPGP or GnuPG on paper"; + longDescription = '' + A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP, etc) + keys is to print them out on paper. Paper and ink have amazingly long + retention qualities - far longer than the magnetic or optical means that + are generally used to back up computer data. + ''; + homepage = "http://www.jabberwocky.com/software/paperkey/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cbee0a724ff..a3d283967869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5878,6 +5878,8 @@ let p11_kit = callPackage ../development/libraries/p11-kit { }; + paperkey = callPackage ../tools/security/paperkey { }; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcl = callPackage ../development/libraries/pcl { From 769ab3a218f1ea7999387605bcdb74c8f4b47d46 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 4 Aug 2014 02:46:35 +0200 Subject: [PATCH 281/286] nixos synaptics: allow null value for accelFactor, minSpeed and maxSpeed Some desktop managers like GNOME are able to tweak the speed of the mouse or synaptics at runtime with good defaults. --- nixos/modules/services/x11/hardware/synaptics.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index f2227a34a20c..f5b394b6d98b 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -41,16 +41,19 @@ in { }; accelFactor = mkOption { + type = types.nullOr types.string; default = "0.001"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; minSpeed = mkOption { + type = types.nullOr types.string; default = "0.6"; description = "Cursor speed factor for precision finger motion."; }; maxSpeed = mkOption { + type = types.nullOr types.string; default = "1.0"; description = "Cursor speed factor for highest-speed finger motion."; }; @@ -120,9 +123,9 @@ in { MatchIsTouchpad "on" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - Option "MinSpeed" "${cfg.minSpeed}" - Option "MaxSpeed" "${cfg.maxSpeed}" - Option "AccelFactor" "${cfg.accelFactor}" + ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} + ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} + ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" From a9a4cdd3d02e1f5fd82b6e68bd1248aeb7f66dad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Aug 2014 13:59:08 +0200 Subject: [PATCH 282/286] nixUnstable: Update to 1.8pre3718_51485dc --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 8e60413413f9..afcceb30474b 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3711_45f9a91"; + name = "nix-1.8pre3718_51485dc"; src = fetchurl { - url = "http://hydra.nixos.org/build/12967850/download/5/${name}.tar.xz"; - sha256 = "826d2cc0f6a140b7b93bb31f4ef67cb04bda6423239c58d0e9c33d70434023eb"; + url = "http://hydra.nixos.org/build/13025632/download/5/${name}.tar.xz"; + sha256 = "69f3a0729b6df1adcbfc7c13df405ce7f3f7904b0cbcdd7f6ad3a0af45f4024c"; }; nativeBuildInputs = [ perl pkgconfig ]; From be560b710e47b602a70e74125a8db2b3f37b4997 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 4 Aug 2014 15:53:05 +0200 Subject: [PATCH 283/286] anki: update from 2.0.26 to 2.0.28 --- pkgs/games/anki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 86f4b961315e..1925c73b2e4a 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,13 +6,13 @@ let py = pythonPackages; - version = "2.0.26"; + version = "2.0.28"; in stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "0w1dn2v6mbyq4dfyjskx51qwfqy6jpskpg4v5pzrv30big274p4q"; + sha256 = "0dj33mlc23y982kcl4h0aganb4fy70rl28mpj2mbcfphykzkv05s"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] From 7af9134293d3aae716eaed596ac7e17af9e44cf5 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 4 Aug 2014 15:54:05 +0200 Subject: [PATCH 284/286] pass: update from 1.6.2 to 1.6.3 --- pkgs/tools/security/pass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index f9bc01715924..3b44edcf1d3b 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -7,12 +7,12 @@ assert withX -> xclip != null; stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.6.3"; name = "password-store-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j"; + sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl"; }; patches = [ ./darwin-getopt.patch ]; From 166fbcaf28995fb50c59b86de8a53a2d56072334 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 4 Aug 2014 15:56:11 +0200 Subject: [PATCH 285/286] pngcrush: update from 1.7.73 to 1.7.76 --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 2a4364164dd8..b27e5132804b 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.73"; + name = "pngcrush-1.7.76"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "073y19af0sw36nw7draqw9zfd6n7q7b84kscy26s76fhj5x2gb0l"; + sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv"; }; configurePhase = '' From b35770818d70924b2b71ae41ead270fe0be8c826 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Aug 2014 16:45:05 +0200 Subject: [PATCH 286/286] In Nix chroots, provide plain bash, not bash-interactive This way we don't get ncurses in the chroot. Also, use a bind-mount of /bin/sh to bash, rather than the entire /bin from the host filesystem. --- nixos/modules/services/misc/nix-daemon.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1ebd3c3643df..c98c0511b566 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -22,14 +22,11 @@ let nixConf = let - # Tricky: if we're using a chroot for builds, then we need - # /bin/sh in the chroot (our own compromise to purity). - # However, since /bin/sh is a symlink to some path in the - # Nix store, which furthermore has runtime dependencies on - # other paths in the store, we need the closure of /bin/sh - # in `build-chroot-dirs' - otherwise any builder that uses - # /bin/sh won't work. - binshDeps = pkgs.writeReferencesToFile config.system.build.binsh; + # If we're using a chroot for builds, then provide /bin/sh in + # the chroot as a bind-mount to bash. This means we also need to + # include the entire closure of bash. + sh = pkgs.stdenv.shell; + binshDeps = pkgs.writeReferencesToFile sh; in pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) @@ -40,7 +37,7 @@ let build-users-group = nixbld build-max-jobs = ${toString (cfg.maxJobs)} build-use-chroot = ${if cfg.useChroot then "true" else "false"} - build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths) + build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths) binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} $extraOptions @@ -253,8 +250,6 @@ in config = { - nix.chrootDirs = [ "/bin" ]; - environment.etc."nix/nix.conf".source = nixConf; # List of machines for distributed Nix builds in the format