From 3e4511b933820f1e90072e6873f973024788ea07 Mon Sep 17 00:00:00 2001 From: Dries Van Daele Date: Mon, 23 Sep 2013 15:41:04 +0200 Subject: [PATCH 01/44] add the mpc (mpd cli client) package --- pkgs/applications/audio/mpc/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100755 pkgs/applications/audio/mpc/default.nix diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix new file mode 100755 index 000000000000..3a7571e38073 --- /dev/null +++ b/pkgs/applications/audio/mpc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mpd_clientlib }: + +stdenv.mkDerivation rec { + version = "0.23"; + name = "mpc-${version}"; + + src = fetchurl { + url = "http://www.musicpd.org/download/mpc/0/${name}.tar.bz2"; + sha256 = "1ir96wfgq5qfdd2s06zfycv38g3bhn3bpndwx9hwf1w507rvifi9"; + }; + + buildInputs = [ mpd_clientlib ]; + + preConfigure = + '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.2.0.8 + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; + + meta = { + description = "A minimalist command line interface to MPD"; + homepage = http://www.musicpd.org/clients/mpc/; + license = "GPL2"; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38dd85a22527..d577267fa6e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8181,6 +8181,8 @@ let mpg123 = callPackage ../applications/audio/mpg123 { }; mpg321 = callPackage ../applications/audio/mpg321 { }; + + mpc_cli = callPackage ../applications/audio/mpc { }; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; From 6b5cbfb310c967c71a2b2aed8de1e66199d7b325 Mon Sep 17 00:00:00 2001 From: Dries Van Daele Date: Mon, 23 Sep 2013 15:41:04 +0200 Subject: [PATCH 02/44] add the mpc (mpd cli client) package --- pkgs/applications/audio/mpc/default.nix | 26 +++++++++++++++++++++++++ pkgs/servers/mpd/clientlib.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100755 pkgs/applications/audio/mpc/default.nix diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix new file mode 100755 index 000000000000..3a7571e38073 --- /dev/null +++ b/pkgs/applications/audio/mpc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mpd_clientlib }: + +stdenv.mkDerivation rec { + version = "0.23"; + name = "mpc-${version}"; + + src = fetchurl { + url = "http://www.musicpd.org/download/mpc/0/${name}.tar.bz2"; + sha256 = "1ir96wfgq5qfdd2s06zfycv38g3bhn3bpndwx9hwf1w507rvifi9"; + }; + + buildInputs = [ mpd_clientlib ]; + + preConfigure = + '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.2.0.8 + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; + + meta = { + description = "A minimalist command line interface to MPD"; + homepage = http://www.musicpd.org/clients/mpc/; + license = "GPL2"; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index b10239e1b772..36d8a73df511 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, doxygen }: stdenv.mkDerivation rec { - version = "2.8"; + + + version = "${passthru.majorVersion}.${passthru.minorVersion}"; name = "libmpdclient-${version}"; + src = fetchurl { url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.bz2"; sha256 = "1qwjkb56rsbk0hwhg7fl15d6sf580a19gh778zcdg374j4yym3hh"; @@ -10,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ doxygen ]; + passthru = { + majorVersion = "2"; + minorVersion = "8"; + }; + meta = { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38dd85a22527..d577267fa6e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8181,6 +8181,8 @@ let mpg123 = callPackage ../applications/audio/mpg123 { }; mpg321 = callPackage ../applications/audio/mpg321 { }; + + mpc_cli = callPackage ../applications/audio/mpc { }; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; From 6acf0f1f4894b8a401ee7790d948f9aa82b68c4c Mon Sep 17 00:00:00 2001 From: Dries Van Daele Date: Mon, 23 Sep 2013 21:14:50 +0200 Subject: [PATCH 03/44] add algorith as maintainer --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index a6ef3b9c07f3..f5a8c5bce989 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -5,6 +5,7 @@ alphabetically sorted. */ aforemny = "Alexander Foremny "; + algorith = "Dries Van Daele "; all = "Nix Committers "; amiddelk = "Arie Middelkoop "; amorsillo = "Andrew Morsillo "; From f93daff6a3cf88d47544a710ee0dda8a79afd0dd Mon Sep 17 00:00:00 2001 From: Dries Van Daele Date: Mon, 23 Sep 2013 21:16:14 +0200 Subject: [PATCH 04/44] remove some whitelines --- pkgs/servers/mpd/clientlib.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 36d8a73df511..612ec0456f2a 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, doxygen }: stdenv.mkDerivation rec { - - version = "${passthru.majorVersion}.${passthru.minorVersion}"; name = "libmpdclient-${version}"; From 7b60802599a39dcb769005faac401574f56cebf9 Mon Sep 17 00:00:00 2001 From: Dries Van Daele Date: Mon, 23 Sep 2013 21:20:51 +0200 Subject: [PATCH 05/44] added maintainer and enabled dynamic loading of lib --- pkgs/applications/audio/mpc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 3a7571e38073..bd21550a64cf 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.2.0.8 + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} ''; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; license = "GPL2"; + maintainers = [ stdenv.lib.maintainers.algorith ]; platforms = stdenv.lib.platforms.linux; }; } \ No newline at end of file From ab65932cea7c46fe37410c7c3b13fb1bdda3a817 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 25 Sep 2013 13:05:54 +0100 Subject: [PATCH 06/44] rubyripper: New expression Adds minimal support for being able to run rrip_cli --- pkgs/applications/audio/rubyripper/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/audio/rubyripper/default.nix diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix new file mode 100644 index 000000000000..36f1fc8312fb --- /dev/null +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: +stdenv.mkDerivation rec { + version = "0.6.2"; + name = "rubyripper-${version}"; + src = fetchurl { + url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; + sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; + }; + configureFlags = [ "--enable-cli" ]; + buildInputs = [ ruby cdparanoia makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/rrip_cli" \ + --prefix PATH : "${ruby}/bin" \ + --prefix PATH : "${cdparanoia}/bin" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d62f936bc3..0fdf57770652 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8451,6 +8451,8 @@ let enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); }; + rubyripper = callPackage ../applications/audio/rubyripper {}; + rxvt = callPackage ../applications/misc/rxvt { }; # = urxvt From bae1462276cf0e86c07d339f2400085e55a9913e Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 26 Sep 2013 18:55:27 -0700 Subject: [PATCH 07/44] Disable introspection for gcr. gcr stopped building after 7fbcc562 (adding introspection into GTK libs); this gets it to build again. --- pkgs/desktops/gnome-3/core/gcr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index cf9774c5511c..44053b88fbc7 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -14,5 +14,7 @@ stdenv.mkDerivation rec { libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk ]; + configureFlags = "--disable-introspection"; + #doCheck = true; } From 596581914fea4ad1e734e596e310323f925f892d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 27 Sep 2013 22:30:49 +0200 Subject: [PATCH 08/44] URxvt: Use 256 colors not just 88. --- pkgs/applications/misc/rxvt_unicode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 2afa6c086961..8c16d290f86e 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }: -let +let name = "rxvt-unicode"; version = "9.16"; n = "${name}-${version}"; @@ -17,14 +17,14 @@ stdenv.mkDerivation (rec { }; buildInputs = - [ libX11 libXt libXft ncurses /* required to build the terminfo file */ + [ libX11 libXt libXft ncurses /* required to build the terminfo file */ fontconfig freetype pkgconfig libXrender ] ++ stdenv.lib.optional perlSupport perl ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf; preConfigure = '' - configureFlags="--with-terminfo=$out/share/terminfo ${if perlSupport then "--enable-perl" else "--disable-perl"}"; + configureFlags="--with-terminfo=$out/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}"; export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " From fdc6e4372fea92d18e0069faf7d5f29314869a56 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Fri, 20 Sep 2013 09:26:07 +1000 Subject: [PATCH 09/44] Wrapped R's package system similarly to perlPackages --- pkgs/applications/science/math/R/default.nix | 2 + .../applications/science/math/R/setup-hook.sh | 5 + pkgs/build-support/fetchurl/mirrors.nix | 96 +++++++ pkgs/development/r-modules/generic/builder.sh | 23 ++ .../development/r-modules/generic/default.nix | 17 ++ pkgs/top-level/all-packages.nix | 8 + pkgs/top-level/r-packages.nix | 246 ++++++++++++++++++ 7 files changed, 397 insertions(+) create mode 100644 pkgs/applications/science/math/R/setup-hook.sh create mode 100644 pkgs/development/r-modules/generic/builder.sh create mode 100644 pkgs/development/r-modules/generic/default.nix create mode 100644 pkgs/top-level/r-packages.nix diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index a6cf329339f8..51505d614399 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + setupHook = ./setup-hook.sh; + meta = { homepage = "http://www.r-project.org/"; description = "a free software environment for statistical computing and graphics"; diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh new file mode 100644 index 000000000000..a31289bbfba9 --- /dev/null +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -0,0 +1,5 @@ +addRLibPath () { + addToSearchPath R_LIBS_SITE $1/library +} + +envHooks=(${envHooks[@]} addRLibPath) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index b7461678fea4..c4841c50d94c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -271,4 +271,100 @@ rec { ftp://ftp.xemacs.org/sites/metalab.unc.edu/ ]; + # CRAN mirrors (from http://cran.r-project.org/mirrors.html) + cran = [ + http://cran.r-project.org/ + http://cran.rstudio.com/ + http://mirror.fcaglp.unlp.edu.ar/CRAN/ + http://r.mirror.mendoza-conicet.gob.ar/ + http://cran.csiro.au/ + http://cran.ms.unimelb.edu.au/ + http://cran.at.r-project.org/ + http://www.freestatistics.org/cran/ + http://cran-r.c3sl.ufpr.br/ + http://cran.fiocruz.br/ + http://www.vps.fmvz.usp.br/CRAN/ + http://brieger.esalq.usp.br/CRAN/ + http://cran.stat.sfu.ca/ + http://mirror.its.dal.ca/cran/ + http://probability.ca/cran/ + http://cran.skazkaforyou.com/ + http://cran.parentingamerica.com/ + http://dirichlet.mat.puc.cl/ + http://ftp.ctex.org/mirrors/CRAN/ + http://mirror.bjtu.edu.cn/cran + http://cran.dataguru.cn/ + http://mirrors.ustc.edu.cn/CRAN/ + http://mirrors.xmu.edu.cn/CRAN/ + http://www.laqee.unal.edu.co/CRAN/ + http://www.icesi.edu.co/CRAN/ + http://mirrors.dotsrc.org/cran/ + http://cran.espol.edu.ec/ + http://cran.univ-lyon1.fr/ + http://mirror.ibcp.fr/pub/CRAN/ + http://ftp.igh.cnrs.fr/pub/CRAN/ + http://cran.irsn.fr/ + http://cran.univ-paris1.fr/ + http://mirrors.softliste.de/cran/ + http://cran.r-mirror.de/ + http://ftp5.gwdg.de/pub/misc/cran/ + http://cran.cc.uoc.gr/ + http://cran.rapporter.net/ + http://ftp.iitm.ac.in/cran/ + http://cran.repo.bppt.go.id/ + http://cran.um.ac.ir/ + http://ftp.heanet.ie/mirrors/cran.r-project.org/ + http://cran.mirror.garr.it/mirrors/CRAN/ + http://cran.stat.unipd.it/ + http://dssm.unipa.it/CRAN/ + http://essrc.hyogo-u.ac.jp/cran/ + http://cran.md.tsukuba.ac.jp/ + http://cran.ism.ac.jp/ + http://cran.nexr.com/ + http://biostat.cau.ac.kr/CRAN/ + http://cran.itam.mx/ + http://www.est.colpos.mx/R-mirror/ + http://cran.xl-mirror.nl/ + http://cran-mirror.cs.uu.nl/ + http://cran.stat.auckland.ac.nz/ + http://cran.uib.no/ + http://cran.stat.upd.edu.ph/ + http://r.meteo.uni.wroc.pl/ + http://cran.dcc.fc.up.pt/ + http://cran.gis-lab.info/ + http://cran.stat.nus.edu.sg/ + http://cran.fyxm.net/ + http://r.adu.org.za/ + http://cran.mirror.ac.za/ + http://cran.es.r-project.org/ + http://ftp.sunet.se/pub/lang/CRAN/ + http://stat.ethz.ch/CRAN/ + http://cran.cs.pu.edu.tw/ + http://cran.csie.ntu.edu.tw/ + http://mirrors.psu.ac.th/pub/cran/ + http://cran.pau.edu.tr/ + http://www.stats.bris.ac.uk/R/ + http://cran.ma.imperial.ac.uk/ + http://star-www.st-andrews.ac.uk/cran/ + http://cran.cnr.berkeley.edu/ + http://cran.stat.ucla.edu/ + http://streaming.stat.iastate.edu/CRAN/ + http://ftp.ussg.iu.edu/CRAN/ + http://rweb.quant.ku.edu/cran/ + http://watson.nci.nih.gov/cran_mirror/ + http://cran.mtu.edu/ + http://cran.wustl.edu/ + http://cran.case.edu/ + http://ftp.osuosl.org/pub/cran/ + http://lib.stat.cmu.edu/R/CRAN/ + http://cran.mirrors.hoobly.com/ + http://mirrors.nics.utk.edu/cran/ + http://cran.revolutionanalytics.com/ + http://cran.fhcrc.org/ + http://cran.cs.wwu.edu/ + http://camoruco.ing.uc.edu.ve/cran/ + http://cran.vinastat.com/ + http://lib.stat.cmu.edu/ + ]; + } diff --git a/pkgs/development/r-modules/generic/builder.sh b/pkgs/development/r-modules/generic/builder.sh new file mode 100644 index 000000000000..0c5d934c10c3 --- /dev/null +++ b/pkgs/development/r-modules/generic/builder.sh @@ -0,0 +1,23 @@ +source $stdenv/setup + +export R_LIBS_SITE="$R_LIBS_SITE${R_LIBS_SITE:+:}$out/library" + + +if test -n "$rPreHook"; then + eval "$rPreHook" +fi + +installPhase() { + runHook preInstall + mkdir -p $out/library + R CMD INSTALL -l $out/library $src + runHook postInstall +} + +postFixup() { + if test -e $out/nix-support/propagated-native-build-inputs; then + ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages + fi +} + +genericBuild diff --git a/pkgs/development/r-modules/generic/default.nix b/pkgs/development/r-modules/generic/default.nix new file mode 100644 index 000000000000..d405cc018d15 --- /dev/null +++ b/pkgs/development/r-modules/generic/default.nix @@ -0,0 +1,17 @@ +R: + +{ buildInputs ? [], ... } @ attrs: + +R.stdenv.mkDerivation ( + { + } + // + attrs + // + { + name = "r-" + attrs.name; + builder = ./builder.sh; + buildInputs = buildInputs ++ [ R ]; + phases = [ "installPhase" "fixupPhase" ]; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e3f9798d5c5..7ea692d11a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5975,6 +5975,14 @@ let ZopeInterface = pythonPackages.zope_interface; + ### DEVELOPMENT / R MODULES + + buildRPackage = import ../development/r-modules/generic R; + + rPackages = recurseIntoAttrs (import ./r-packages.nix { + inherit pkgs; + __overrides = (config.rPackageOverrides or (p: {})) pkgs; + }); ### SERVERS diff --git a/pkgs/top-level/r-packages.nix b/pkgs/top-level/r-packages.nix new file mode 100644 index 000000000000..8280b6c2d53c --- /dev/null +++ b/pkgs/top-level/r-packages.nix @@ -0,0 +1,246 @@ +/* This file defines the composition for CRAN (R) packages. */ + +{pkgs, __overrides}: + +rec { + + inherit (pkgs) buildRPackage fetchurl stdenv R; + + inherit (stdenv.lib) maintainers; + + inherit __overrides; + + abind = buildRPackage rec { + name = "abind-1.4-0"; + src = fetchurl { + url = "mirror://cran/src/contrib/abind_1.4-0.tar.gz"; + sha256 = "1b9634bf6ad68022338d71a23a689f1af4afd9d6c12c0b982b88fc21363ff568"; + }; + }; + + chron = buildRPackage rec { + name = "chron-2.3-44"; + src = fetchurl { + url = "mirror://cran/src/contrib/chron_2.3-44.tar.gz"; + sha256 = "ba7d46223e615b4d09145a364a4c37ccff718384486ca154a6e025cf3ed91148"; + }; + }; + + colorspace = buildRPackage rec { + name = "colorspace-1.2-2"; + src = fetchurl { + url = "mirror://cran/src/contrib/colorspace_1.2-2.tar.gz"; + sha256 = "7f6ca98e5d005bc7d6e37b03577d65995809150d1d293ce68b6720e7a6b2054d"; + }; + }; + + DBI = buildRPackage rec { + name = "DBI-0.2-7"; + src = fetchurl { + url = "mirror://cran/src/contrib/DBI_0.2-7.tar.gz"; + sha256 = "e90a988740f99060d5c4aacb1f2b148b0eb81c5b468bafeadf3aaeccf563b5e3"; + }; + }; + + dichromat = buildRPackage rec { + name = "dichromat-2.0-0"; + src = fetchurl { + url = "mirror://cran/src/contrib/dichromat_2.0-0.tar.gz"; + sha256 = "31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1"; + }; + }; + + digest = buildRPackage rec { + name = "digest-0.6.3"; + src = fetchurl { + url = "mirror://cran/src/contrib/digest_0.6.3.tar.gz"; + sha256 = "5be8f1386c0c273fcc915df7b557393c5f3de43c44fd16614db9cc5ba6d1d57c"; + }; + }; + + ggplot2 = buildRPackage rec { + name = "ggplot2-0.9.3.1"; + src = fetchurl { + url = "mirror://cran/src/contrib/ggplot2_0.9.3.1.tar.gz"; + sha256 = "b4c97404fd44571f9980712af963949ed204b5d4e639d97df9ba9a17423a6601"; + }; + propagatedBuildInputs = [ digest plyr gtable reshape2 scales proto ]; + }; + + gtable = buildRPackage rec { + name = "gtable-0.1.2"; + src = fetchurl { + url = "mirror://cran/src/contrib/gtable_0.1.2.tar.gz"; + sha256 = "b08ba8e62e0ce05e7a4c07ba3ffa67719161db62438b04f14343f8928d74304d"; + }; + }; + + gtools = buildRPackage rec { + name = "gtools-3.0.0"; + src = fetchurl { + url = "mirror://cran/src/contrib/gtools_3.0.0.tar.gz"; + sha256 = "e35f08ac9df875b57dcf23028baa226372d7482d7814a011f9b1fdd0697ee73c"; + }; + }; + + gsubfn = buildRPackage rec { + name = "gsubfn-0.6-5"; + src = fetchurl { + url = "mirror://cran/src/contrib/gsubfn_0.6-5.tar.gz"; + sha256 = "9a7b51ae6aabd1c99e8633d3dc75232d8c4a175df750c7d1c359bd0f5fc197be"; + }; + propagatedBuildInputs = [ proto ]; + }; + + labeling = buildRPackage rec { + name = "labeling-0.2"; + src = fetchurl { + url = "mirror://cran/src/contrib/labeling_0.2.tar.gz"; + sha256 = "8aaa7f8b91923088da4e47ae42620fadcff7f2bc566064c63d138e2145e38aa4"; + }; + }; + + lars = buildRPackage rec { + name = "lars-1.2"; + src = fetchurl { + url = "mirror://cran/src/contrib/lars_1.2.tar.gz"; + sha256 = "64745b568f20b2cfdae3dad02fba92ebf78ffee466a71aaaafd4f48c3921922e"; + }; + }; + + LiblineaR = buildRPackage rec { + name = "LiblineaR-1.80-7"; + src = fetchurl { + url = "mirror://cran/src/contrib/LiblineaR_1.80-7.tar.gz"; + sha256 = "9ba0280c5165bf0bbd46cb5ec7c66fdece38fc3f73fce2ec800763923ae8e4bd"; + }; + }; + + linprog = buildRPackage rec { + name = "linprog-0.9-2"; + src = fetchurl { + url = "mirror://cran/src/contrib/linprog_0.9-2.tar.gz"; + sha256 = "8937b2e30692e38de1713f1513b78f505f73da6f5b4a576d151ad60bac2221ce"; + }; + propagatedBuildInputs = [ lpSolve ]; + }; + + lpSolve = buildRPackage rec { + name = "lpSolve-5.6.7"; + src = fetchurl { + url = "mirror://cran/src/contrib/lpSolve_5.6.7.tar.gz"; + sha256 = "16def9237f38c4d7a59651173fd87df3cd3c563f640c6952e13bdd2a084737ef"; + }; + }; + + munsell = buildRPackage rec { + name = "munsell-0.4.2"; + src = fetchurl { + url = "mirror://cran/src/contrib/munsell_0.4.2.tar.gz"; + sha256 = "84e787f58f626c52a1e3fc1201f724835dfa8023358bfed742e7001441f425ae"; + }; + propagatedBuildInputs = [ colorspace ]; + }; + + pamr = buildRPackage rec { + name = "pamr-1.54.1"; + src = fetchurl { + url = "mirror://cran/src/contrib/pamr_1.54.1.tar.gz"; + sha256 = "139dbc39b4eccd6a55b6a3c42a1c8be61dcce0613535a634c3e42731fc315516"; + }; + }; + + penalized = buildRPackage rec { + name = "penalized-0.9-42"; + src = fetchurl { + url = "mirror://cran/src/contrib/penalized_0.9-42.tar.gz"; + sha256 = "98e8e39b02ecbabaa7050211e34941c73e1e687f39250cf3cbacb7c5dcbb1e98"; + }; + }; + + plyr = buildRPackage rec { + name = "plyr-1.8"; + src = fetchurl { + url = "mirror://cran/src/contrib/plyr_1.8.tar.gz"; + sha256 = "0bd6861af241e6c5ce777ef3f1b0eb72b31cc026669a68f6250b8ecfadf71a66"; + }; + }; + + proto = buildRPackage rec { + name = "proto-0.3-10"; + src = fetchurl { + url = "mirror://cran/src/contrib/proto_0.3-10.tar.gz"; + sha256 = "d0d941bfbf247879b3510c8ef3e35853b1fbe83ff3ce952e93d3f8244afcbb0e"; + }; + }; + + randomForest = buildRPackage rec { + name = "randomForest-4.6-7"; + src = fetchurl { + url = "mirror://cran/src/contrib/randomForest_4.6-7.tar.gz"; + sha256 = "8206e88b242c07efc10f148d17dfcc265a31361e1bcf44bfe17aed95c357be0b"; + }; + propagatedBuildInputs = [ plyr stringr ]; + }; + + reshape2 = buildRPackage rec { + name = "reshape2-1.2.2"; + src = fetchurl { + url = "mirror://cran/src/contrib/reshape2_1.2.2.tar.gz"; + sha256 = "9131025b8f684e1629ab3e2748d4cf2b907b7c89cfbff667c925bc0fb5dfc103"; + }; + propagatedBuildInputs = [ plyr stringr ]; + }; + + RColorBrewer = buildRPackage rec { + name = "RColorBrewer-1.0-5"; + src = fetchurl { + url = "mirror://cran/src/contrib/RColorBrewer_1.0-5.tar.gz"; + sha256 = "5ac1c44c1a53f9521134e7ed7c148c72e49271cbd229c5263d2d7fd91c8b8e78"; + }; + }; + + RSQLite = buildRPackage rec { + name = "RSQlite-0.11.4"; + src = fetchurl { + url = "mirror://cran/src/contrib/RSQLite_0.11.4.tar.gz"; + sha256 = "bba0cbf2a1a3120d667a731da1ca5b9bd4db23b813e1abf6f51fb01540c2000c"; + }; + propagatedBuildInputs = [ DBI ]; + }; + + RSQLiteExtfuns = buildRPackage rec { + name = "RSQlite.extfuns-0.0.1"; + src = fetchurl { + url = "mirror://cran/src/contrib/RSQLite.extfuns_0.0.1.tar.gz"; + sha256 = "ca5c7947c041e17ba83bed3f5866f7eeb9b7f361e5c050c9b58eec5670f03d0e"; + }; + propagatedBuildInputs = [ RSQLite ]; + }; + + scales = buildRPackage rec { + name = "scales-0.2.3"; + src = fetchurl { + url = "mirror://cran/src/contrib/scales_0.2.3.tar.gz"; + sha256 = "46aef8eb261abc39f87b71184e5484bc8c2c94e01d3714ce4b2fd60727bc40d9"; + }; + propagatedBuildInputs = [ RColorBrewer stringr dichromat munsell plyr labeling ]; + }; + + stringr = buildRPackage rec { + name = "stringr-0.6.2"; + src = fetchurl { + url = "mirror://cran/src/contrib/stringr_0.6.2.tar.gz"; + sha256 = "c3fc9c71d060ad592d2cfc51c36ab2f8e5f8cf9a25dfe42c637447dd416b6737"; + }; + }; + + sqldf = buildRPackage rec { + name = "sqldf-0.4-6.4"; + src = fetchurl { + url = "mirror://cran/src/contrib/sqldf_0.4-6.4.tar.gz"; + sha256 = "6c51e4e48b93310f765c661a1756fe068629da775248d38a98c38f5b6f7511c4"; + }; + propagatedBuildInputs = [ DBI gsubfn proto chron RSQLite RSQLiteExtfuns ]; + }; +} From b4f10018cdc29e32efce73068b367b4bb0c11a7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 13:23:34 +0200 Subject: [PATCH 10/44] screen: meta section cosmetic --- pkgs/tools/misc/screen/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 7363719b66d3..c2c0a5aa534f 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/screen/; - description = "GNU Screen, a window manager that multiplexes a physical terminal"; + description = "a window manager that multiplexes a physical terminal"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Screen is a full-screen window manager that multiplexes a physical @@ -46,8 +47,6 @@ stdenv.mkDerivation rec { terminal. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; From c3237756b482761bc1767c23bb5a7e37f629f2ef Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sat, 28 Sep 2013 19:44:52 +0800 Subject: [PATCH 11/44] fcitx: update to 4.2.8.3 Set platforms and add myself as a maintainer. --- pkgs/tools/inputmethods/fcitx/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index ac60cd6134f9..94d819680ab1 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant, isocodes, icu, libpthreadstubs -, pango, cairo, libxkbfile, xorg +, pango, cairo, libxkbfile, libXau, libXdmcp }: stdenv.mkDerivation rec { - name = "fcitx-4.2.7"; + name = "fcitx-4.2.8.3"; src = fetchurl { - url = "https://fcitx.googlecode.com/files/${name}_dict.tar.xz"; - sha256 = "1dfvr77j9vnlg76155clrjxnm59r5fzv0d3n6c6yn10zb0bjd40c"; + url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; + sha256 = "05dw6cbjh2jyjrkr4qx2bcq6nyhhrs0akf6fcjk5a72bgphhwqnb"; }; buildInputs = [ cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile - intltool cairo icu libpthreadstubs xorg.libXau xorg.libXdmcp + intltool cairo icu libpthreadstubs libXau libXdmcp ]; cmakeFlags = '' @@ -28,5 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://code.google.com/p/fcitx/"; description = "A Flexible Input Method Framework"; license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [iyzsong]; }; } From 36f7b4e1a29cd791afce4c8600085259919d7a2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 12/44] haskell-active: update to version 0.1.0.7 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 1552a1418d8f..92cf31226b26 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.6"; - sha256 = "0hh52hkmma4lxfv3gj7x23cwx8v6wd1cm9hblvhzhylxk8dyl5m7"; + version = "0.1.0.7"; + sha256 = "18pcw98ni8fiy0yd7wmrqvpaf2wgav70rsikqfl571zjmdmzdw7p"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From 62fcba700cd0182d91362ccda6f8c77027384f2a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 13/44] haskell-amqp: update to version 0.6.0 --- pkgs/development/libraries/haskell/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 7b934bbe6694..70e86ef1ffb7 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "amqp"; - version = "0.5.0"; - sha256 = "1i02pp184r1iq40mz16m9qh8i3h1jmf3ykpg67j3i1732cks8n8w"; + version = "0.6.0"; + sha256 = "0rfczmhf46sc3pxxb5gwv4ggsxkqkvdi4kkqdnrdpdhs7p41im2n"; isLibrary = true; isExecutable = true; buildDepends = [ binary dataBinaryIeee754 network text xml ]; From 4d07773c0da9c74fcf7d49099d6a5efb5bcbb760 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 14/44] haskell-cereal: update to version 0.4.0.0 --- pkgs/development/libraries/haskell/cereal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index a28ea11c511e..4770d5216e2e 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.3.5.2"; - sha256 = "0yjxvhagsm552idfrs6d9lzlz6x5878xj1vfg0zxf8w1kixgghil"; + version = "0.4.0.0"; + sha256 = "0q6lrfa2p70mh3d08mbj89anc3p9ycy6wyyiycj5pm62kcimv7rj"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; From 18856128094ad98bd4b98491e02192154f0b607c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 15/44] haskell-classy-prelude-conduit: update to version 0.6.0 --- .../haskell/classy-prelude-conduit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index c04b4dfc25e1..b6bf865d1839 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -1,14 +1,14 @@ { cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck -, resourcet, transformers, void, xmlConduit +, resourcet, systemFileio, transformers, void }: cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.5.3"; - sha256 = "1rmx439kdjipyz2s3v2s1xv1mb55kb4njl9k6f8mfhykgac39rhz"; + version = "0.6.0"; + sha256 = "122clkwrz1n009b5gxq96sbby7i8kb4dgvc90ydamd86bx3pvc84"; buildDepends = [ - classyPrelude conduit monadControl resourcet transformers void - xmlConduit + classyPrelude conduit monadControl resourcet systemFileio + transformers void ]; testDepends = [ conduit hspec QuickCheck transformers ]; meta = { From 3c051be3ce9a2f303056d6e363be5ab656c204e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 16/44] haskell-classy-prelude: update to version 0.6.0 --- .../libraries/haskell/classy-prelude/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 53b3bae1cefe..f296ff21ced8 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,17 +1,21 @@ { cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase -, monadControl, QuickCheck, systemFilepath, text, transformers -, unorderedContainers, vector +, monadControl, monoTraversable, QuickCheck, semigroups +, systemFilepath, text, transformers, unorderedContainers, vector +, vectorInstances }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.10"; - sha256 = "04grmld90qr8m6lcdf83clai0anpp8iry7m9l9li8ija9fckl3lk"; + version = "0.6.0"; + sha256 = "0wpymr2gl0hmbgpw0qd0h1ik1h42s8raykq7jsdjqnmcvsmww5j6"; buildDepends = [ async basicPrelude deepseq hashable liftedBase monadControl - systemFilepath text transformers unorderedContainers vector + monoTraversable semigroups systemFilepath text transformers + unorderedContainers vector vectorInstances + ]; + testDepends = [ + hspec QuickCheck transformers unorderedContainers ]; - testDepends = [ hspec QuickCheck transformers ]; meta = { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; From 27578d227870d79758f1fb930bc817a45be68960 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 17/44] haskell-data-lens: update to version 2.10.3 --- pkgs/development/libraries/haskell/data-lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index e4cff67f3761..25a81084a4a9 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "data-lens"; - version = "2.10.2"; - sha256 = "1mv4lh5rhmq09d89ci07kj9anv7ckrlqh9x3xr4jq9idf7sf54b5"; + version = "2.10.3"; + sha256 = "0x8qrcsnl1z2n3vwld0jcnapmzlzjgyzpa34qjyxpv4f15xn8vic"; buildDepends = [ comonad comonadTransformers semigroupoids transformers ]; From 8c93b506db47276fed2f7270f87c778b390ca63a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 18/44] haskell-diagrams-core: update to version 0.7.0.1 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index c2dbb27aebd1..33fa353628bb 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "0.7"; - sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq"; + version = "0.7.0.1"; + sha256 = "1826f6yrb0ch07y4bjb1cnqi8giphn2i6g45484qr6bfbb8wj5dg"; buildDepends = [ dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From fdefb23cad458b929e0270e4de4b8b1e74f573f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:08 +0200 Subject: [PATCH 19/44] haskell-diagrams-lib: update to version 0.7.1.1 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 9b5062479be1..43ada20aecc4 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.7.1"; - sha256 = "1ig7a0ns458aqk9yxya7djdd40x3iyd1lycjygdl3zgl2pjpdva7"; + version = "0.7.1.1"; + sha256 = "14d557y22dqyjr026vbawa2a2yjh7alh3rpavyidfdlrg48lqgrc"; buildDepends = [ active colour dataDefaultClass diagramsCore fingertree intervals monoidExtras newtype NumInstances semigroups vectorSpace From 22b2956579a40d771a2fcd00a5047121c5d2181f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 20/44] haskell-dual-tree: update to version 0.1.0.4 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 8500de5fcfb6..c0896557e339 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.1.0.3"; - sha256 = "0k3p1lqhynlqvkbnrs5vn478c76qcn754n5pb17p5i4jcw94bm0n"; + version = "0.1.0.4"; + sha256 = "0xrpb7kz6aazqy9w0b7hcbxgmy4ddy0zh7gdpv2w140vvyx5qjrn"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From 9ee2eef9967af07c0457092c24e1302f64ce05bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 21/44] haskell-generic-deriving: update to version 1.6.2 --- .../libraries/haskell/generic-deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index f1a1ec837fd4..5081d09939bf 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.6.1"; - sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j"; + version = "1.6.2"; + sha256 = "1ryzg7zgnlhx6mbmpsh4fgqf2d758c94qz2zpg3jxns30hd4sfy6"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; From 29f33ae3bb0d5dd815805557e45c0afec838b79a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 22/44] haskell-ghc-mod: update to version 3.1.2 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index ebd4417af994..3504e79d54b7 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "3.1.1"; - sha256 = "0gz5andg5ap7a71ap82rpkbflgj9fcrw47gyzlbn5rpp110d86jf"; + version = "3.1.2"; + sha256 = "164ldbdvr2qrnb9sq0d9y35la4fzwn6x43xqdsi1s10dppckczlm"; isLibrary = true; isExecutable = true; buildDepends = [ From d7e76509f69479510ce1359b8d3f032a3dc785ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 23/44] haskell-groups: update to version 0.4.0.0 --- pkgs/development/libraries/haskell/groups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/groups/default.nix b/pkgs/development/libraries/haskell/groups/default.nix index a03094970706..b2cf829f12ea 100644 --- a/pkgs/development/libraries/haskell/groups/default.nix +++ b/pkgs/development/libraries/haskell/groups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "groups"; - version = "0.3.0.0"; - sha256 = "07swv09l98fxh563w1x8n8xzgh9q7n9dbx4gx3i77kwi72vmxl8x"; + version = "0.4.0.0"; + sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k"; meta = { description = "Haskell 98 groups"; license = self.stdenv.lib.licenses.bsd3; From 15b2ff730cb40a4f1867b1c1acefd60b63148c0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 24/44] haskell-monoid-extras: update to version 0.3.2.2 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 5378c4688089..e9c8691a8ce5 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.2.0"; - sha256 = "0yhb55v0a2221xbpbm8jiqzqvps0lab5n8iakpq69ndr2l0d2r3x"; + version = "0.3.2.2"; + sha256 = "1fy0fk2mzan6n5chc11x303hz3iq3kpx6ma6c8xsi8va1b9ikpda"; buildDepends = [ groupoids groups semigroupoids semigroups ]; jailbreak = true; meta = { From 8bb6c8607266475d57afd228a878de23b91085d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 25/44] haskell-ncurses: update to version 0.2.7 --- pkgs/development/libraries/haskell/ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index e3283a242f50..f900e3c2ef95 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ncurses"; - version = "0.2.6"; - sha256 = "0mcgbq67f8hfdqmvm3p59949mbxcc2mgjw889zxvxx0174kn205q"; + version = "0.2.7"; + sha256 = "026p6b2apgi9r65py45h3rl57xgwzyamq511a0rsb7myzagw22vz"; buildDepends = [ text transformers ]; buildTools = [ c2hs ]; extraLibraries = [ ncurses ]; From a3c6d6968b88877e61f9f8044e75990e0b2247f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 26/44] haskell-pandoc-types: update to version 1.12.1.2 --- pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 966772bca76f..5a0dc1194835 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.12.1.1"; - sha256 = "0afxpsfvhgn8rka1piykddpsav8hdvwiv2gzr06hrlswd0xk89qi"; + version = "1.12.1.2"; + sha256 = "02x1s8m9zzlgj8asr4y247944pg3p8ccnh819rhs2g09qqiq4ylc"; buildDepends = [ aeson syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; From e003eeac663b41606810297ae2f7e5b0c4f18923 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 27/44] haskell-regex-compat-tdfa: update to version 0.95.1.3 --- .../libraries/haskell/regex-compat-tdfa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix index 08c2f6556e28..c7ed906b908f 100644 --- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "regex-compat-tdfa"; - version = "0.95.1.2"; - sha256 = "0b7pp5xq4ybgji5shz5v1a91y6wwzila3vjiyq4nma0xj3njy802"; + version = "0.95.1.3"; + sha256 = "0wl5sqbb3rl5dai3qni8w09wlipc4n1mn9kh5zgb9xl0lcd59pjx"; buildDepends = [ regexBase regexTdfa ]; meta = { homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa"; From 53a81c83b8d7b1e61bd015cc8b59aa85f7fb1919 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 28/44] haskell-shake: update to version 0.10.7 --- pkgs/development/libraries/haskell/shake/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 26171a56fdc5..2588b11ae780 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,16 +1,16 @@ { cabal, binary, deepseq, filepath, hashable, random, time -, transformers, unorderedContainers +, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.6"; - sha256 = "0d2wrgraifcj0rv9jmvc5a0gl0j1jjkc4r0nmaypnv6929kl26q8"; + version = "0.10.7"; + sha256 = "0r48kzldbgixr1c83sd7frvygqyjx32n67nri1nnamcwpvlv8hgv"; isLibrary = true; isExecutable = true; buildDepends = [ binary deepseq filepath hashable random time transformers - unorderedContainers + unorderedContainers utf8String ]; meta = { homepage = "http://community.haskell.org/~ndm/shake/"; From d3214b3f1813cd1fff0caa4728d6957358ceffad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:48:09 +0200 Subject: [PATCH 29/44] haskell-socks: update to version 0.5.2 --- pkgs/development/libraries/haskell/socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 27dd54b29598..22b9a4151237 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.5.1"; - sha256 = "08zwbkglkahjadqn2m7l0k5yp4lcd9h6kgb8k8mjlwxayx82a0ay"; + version = "0.5.2"; + sha256 = "1bvvrc0lzjspab7jn31d45za8g6n9jr52mcf7rs5zci99f5jgpsv"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; From 1856fc13e937e7d53b52be514737d2d400e15d5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:51:18 +0200 Subject: [PATCH 30/44] haskell-primitive: add version 0.5.1.0 --- .../libraries/haskell/primitive/0.5.1.0.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.1.0.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix new file mode 100644 index 000000000000..ff62216b3f4a --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5.1.0"; + sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8"; + meta = { + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 261c7ee16c9c..a2524e9de7a4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alex = self.alex_3_1_0; haddock = self.haddock_2_13_2; happy = self.happy_1_19_0; - primitive = self.primitive_0_5_0_1; # semi-official, but specified + primitive = self.primitive_0_5_1_0; # semi-official, but specified }; haskellPlatformArgs_2013_2_0_0 = self : { @@ -1711,7 +1711,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x punycode = callPackage ../development/libraries/haskell/punycode {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive = self.primitive_0_5_0_1; + primitive_0_5_1_0 = callPackage ../development/libraries/haskell/primitive/0.5.1.0.nix {}; + primitive = self.primitive_0_5_1_0; profunctors = callPackage ../development/libraries/haskell/profunctors {}; From befcb152fd4a94ad7705c6e9e81e0c8ffd90df4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 10:51:30 +0200 Subject: [PATCH 31/44] haskell-vector: add version 0.10.9.1 --- .../libraries/haskell/vector/0.10.9.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/vector/0.10.9.1.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.1.nix b/pkgs/development/libraries/haskell/vector/0.10.9.1.nix new file mode 100644 index 000000000000..975d75526a60 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.9.1.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10.9.1"; + sha256 = "1rdx0r7bwx6217ip9mg9yfymvgv52szqv63y89p41b8sfklmcmi0"; + buildDepends = [ deepseq primitive ]; + meta = { + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a2524e9de7a4..3a0ef4dbf074 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -170,7 +170,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text = self.text_0_11_3_1; transformers = null; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; - vector = self.vector_0_10_0_1; + vector = self.vector_0_10_9_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_1; @@ -2171,7 +2171,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; - vector = self.vector_0_10_0_1; + vector_0_10_9_1 = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {}; + vector = self.vector_0_10_9_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From bdf145fa1ff19352b5481df7d9a35ba703ea773e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 13:27:49 +0200 Subject: [PATCH 32/44] dbus: jailbreak to support recent versions of cereal --- pkgs/development/libraries/haskell/dbus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 16cb2c7ca033..e0072bd8446b 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { cereal libxmlSax network parsec random text transformers vector xmlTypes ]; + jailbreak = true; meta = { homepage = "https://john-millikin.com/software/haskell-dbus/"; description = "A client library for the D-Bus IPC system"; From eaae0cb6bfac5e7825c0f89376e90dd09c8f4a28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 13:28:30 +0200 Subject: [PATCH 33/44] yesod-core: jailbreak to support recent versions of cereal --- pkgs/development/libraries/haskell/yesod-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 153d361f4dd0..179c29addbb5 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -25,6 +25,7 @@ cabal.mkDerivation (self: { QuickCheck random resourcet shakespeareCss shakespeareJs text transformers wai waiTest ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From bc115137482a486ce31cf5087ad29e23ab87b941 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 13:35:44 +0200 Subject: [PATCH 34/44] crypto-conduit: jailbreak to support recent versions of cereal --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 61d6bcbeabea..c7701097c699 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { skein transformers ]; doCheck = false; + jailbreak = true; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; From 7a587163477ba8bfdfc19221182385d4ba063d23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 13:43:51 +0200 Subject: [PATCH 35/44] haskell-gitit: patch to fix build with recent versions of pandoc --- pkgs/development/libraries/haskell/gitit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 45c96e64012d..905d02b70113 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -2,7 +2,7 @@ , filepath, filestore, ghcPaths, happstackServer, highlightingKate , hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc , pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup -, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib +, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchurl }: cabal.mkDerivation (self: { @@ -19,6 +19,10 @@ cabal.mkDerivation (self: { zlib ]; jailbreak = true; + patches = [ (fetchurl { url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch"; + sha256 = "0xdg9frr8lany8ry6vj4vpskmhkpww8jswnb05pzl8a4xfqxh9gd"; + }) + ]; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; From 2fc05b85e01bd197206e061b44d50a2071afed3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 16:13:07 +0200 Subject: [PATCH 36/44] haskell-vector-instances: add version 3.3 --- .../haskell/vector-instances/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vector-instances/default.nix diff --git a/pkgs/development/libraries/haskell/vector-instances/default.nix b/pkgs/development/libraries/haskell/vector-instances/default.nix new file mode 100644 index 000000000000..c6ff62f86cdd --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-instances/default.nix @@ -0,0 +1,17 @@ +{ cabal, comonad, keys, pointed, semigroupoids, semigroups, vector +}: + +cabal.mkDerivation (self: { + pname = "vector-instances"; + version = "3.3"; + sha256 = "0iiw9p2ivcdfsh81vdy4yn6hbigdwclrkssd68hdsg9n6q3fmq5y"; + buildDepends = [ + comonad keys pointed semigroupoids semigroups vector + ]; + meta = { + homepage = "http://github.com/ekmett/vector-instances"; + description = "Orphan Instances for 'Data.Vector'"; + 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 3a0ef4dbf074..a28c91e1c936 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2178,6 +2178,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vectorBinaryInstances = callPackage ../development/libraries/haskell/vector-binary-instances {}; + vectorInstances = callPackage ../development/libraries/haskell/vector-instances {}; + vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; From 44f8e289889e37145cade56f68e6a1b3bf11eef2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Sep 2013 16:13:13 +0200 Subject: [PATCH 37/44] haskell-mono-traversable: add version 0.1.0.0 --- .../haskell/mono-traversable/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/mono-traversable/default.nix diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix new file mode 100644 index 000000000000..42cfee3412b3 --- /dev/null +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -0,0 +1,20 @@ +{ cabal, comonad, hashable, hspec, semigroupoids, semigroups, text +, transformers, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "mono-traversable"; + version = "0.1.0.0"; + sha256 = "1pkg8lagfiixgq2xb4ficgcqv1hhmxy2r49lq9szar7knh0gcjn1"; + buildDepends = [ + comonad hashable semigroupoids semigroups text transformers + unorderedContainers vector + ]; + testDepends = [ hspec text ]; + meta = { + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + 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 a28c91e1c936..9a847e1f3989 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1490,6 +1490,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mongoDB = callPackage ../development/libraries/haskell/mongoDB {}; + monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {}; + mmorph = callPackage ../development/libraries/haskell/mmorph {}; mpppc = callPackage ../development/libraries/haskell/mpppc {}; From 6ab7c495d5f656dd9b1ff37010f1a1057082d94d Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sat, 28 Sep 2013 22:57:14 +0800 Subject: [PATCH 38/44] add aseprite 0.9.5 --- .../applications/editors/aseprite/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/editors/aseprite/default.nix diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix new file mode 100644 index 000000000000..43180bd04e31 --- /dev/null +++ b/pkgs/applications/editors/aseprite/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, cmake, pkgconfig +, giflib, libjpeg, zlib, libpng, tinyxml, allegro +, libX11, libXext, libXcursor, libXpm, libXxf86vm, libXxf86dga +}: + +stdenv.mkDerivation rec { + name = "aseprite-0.9.5"; + + src = fetchurl { + url = "http://aseprite.googlecode.com/files/${name}.tar.xz"; + sha256 = "0m7i6ybj2bym4w9rybacnnaaq2jjn76vlpbp932xcclakl6kdq41"; + }; + + buildInputs = [ + cmake pkgconfig + giflib libjpeg zlib libpng tinyxml allegro + libX11 libXext libXcursor libXpm libXxf86vm libXxf86dga + ]; + + patchPhase = '' + sed -i '/^find_unittests/d' src/CMakeLists.txt + sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt + sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt + sed -i 's/png_\(sizeof\)/\1/g' src/file/png_format.cpp + ''; + + cmakeFlags = '' + -DUSE_SHARED_GIFLIB=ON + -DUSE_SHARED_JPEGLIB=ON + -DUSE_SHARED_ZLIB=ON + -DUSE_SHARED_LIBPNG=ON + -DUSE_SHARED_LIBLOADPNG=ON + -DUSE_SHARED_TINYXML=ON + -DUSE_SHARED_GTEST=ON + -DUSE_SHARED_ALLEGRO4=ON + -DENABLE_UPDATER=OFF + ''; + + NIX_LDFLAGS = "-lX11"; + + meta = { + description = "Animated sprite editor & pixel art tool"; + homepage = "http://www.aseprite.org/"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [iyzsong]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e3f9798d5c5..725d8138f081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7241,6 +7241,8 @@ let arora = callPackage ../applications/networking/browsers/arora { }; + aseprite = callPackage ../applications/editors/aseprite { }; + audacious = callPackage ../applications/audio/audacious { }; audacity = callPackage ../applications/audio/audacity { }; From 185eab3b3320cf17bf11eb10cdd5723986e0a2c2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 9 Sep 2013 08:16:51 +0200 Subject: [PATCH 39/44] language-java: hash change it looks as if the maintainer decided that 0.2.5.1 (which appeared for a short time) could just replace 0.2.5 --- pkgs/development/libraries/haskell/language-java/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index 13054c0714df..e665f5aadde9 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self: { pname = "language-java"; version = "0.2.5"; - sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6"; + sha256 = "1ai6mvzasi8fji4b81nrpy48icf5h25g3kakhpfbzckwf20c9dkd"; buildDepends = [ cpphs parsec syb ]; testDepends = [ filepath HUnit mtl QuickCheck testFramework testFrameworkHunit From d61285e658da14085d70c0ae9ee93db950ef58e7 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 9 Sep 2013 23:57:45 +0200 Subject: [PATCH 40/44] upgrade gpac to more up-to-date svn --- pkgs/applications/video/gpac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6a863a5e2c4b..84848d587533 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { name = "gpac-0.5.0-svn"; src = fetchsvn { - url = "https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"; - rev = "4253"; - sha256 = "0z4bd63c805q53hpb09gq0m0apy12z5a90zxx4jjx3ln64xq0pnn"; + url = "http://svn.code.sf.net/p/gpac/code/trunk/gpac"; + rev = "4749"; + sha256 = "0y38pmp64a2l70y1yby90qzxfzx8y7r0cdmgjxzw86jh6si5ndhp"; }; # this is the bare minimum configuration, as I'm only interested in MP4Box From 05400054ae5182f4ef390094d33ad1c16b7cb315 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 10 Sep 2013 10:22:28 +0200 Subject: [PATCH 41/44] libical: upgrade to 1.0 --- pkgs/development/libraries/libical/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 59d352cf730e..dbb104546ad6 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchsvn, perl, cmake}: +{stdenv, fetchurl, perl, cmake}: stdenv.mkDerivation rec { - name = "libical-0.48-p20120623"; - src = fetchsvn { - url = "https://freeassociation.svn.sourceforge.net/svnroot/freeassociation/trunk/libical"; - rev = "1130"; - sha256 = "56caf19abdf44807fda75a67ef0886319551e53c4e4ece4da4fc862e34c64e1a"; + pName = "libical"; + name = "${pName}-1.0"; + src = fetchurl { + url = "mirror://sourceforge/freeassociation/${pName}/${name}/${name}.tar.gz"; + sha256 = "1dy0drz9hy0sn2q3s2lp00jb9bis5gsm7n3m4zga49s9ir2b6fbw"; }; nativeBuildInputs = [ perl cmake ]; From 9e76aa91b17e8dc4c33c335bda6685300dfaa4d4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 28 Sep 2013 16:20:48 +0200 Subject: [PATCH 42/44] linux-3.11: upgrade to 3.11.2 --- pkgs/os-specific/linux/kernel/linux-3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix index 94773a22bfa0..3d332bd2ce29 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "16wblz06129lxvxsl3rhmdj4b31yzmwv3rxnjmrlj3c3qlzph29c"; + sha256 = "139w8g59fa2kw39kkcpln54mvrl2rq1gv3nqdcrhcy6n1b7r4194"; }; features.iwlwifi = true; From fd67fcb31425fa1605893b3e7373e6afa18c3430 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 29 Sep 2013 00:25:20 +0200 Subject: [PATCH 43/44] Fix chroot-build of fast-export & pinpoint revision to current HEAD. Signed-off-by: Moritz Ulrich --- .../version-management/git-and-tools/fast-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 44e9cd535be6..dcfcce1fcf63 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://repo.or.cz/fast-export.git"; - rev = "refs/heads/master"; + rev = "aaccfba"; + sha256 = "c9d1498e31d32b8271c1e651175794718611f93b4843dea569d831005de0a750"; }; buildInputs = [mercurial.python mercurial makeWrapper subversion]; @@ -19,7 +20,6 @@ stdenv.mkDerivation { sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py l=$out/libexec/git-fast-export mkdir -p $out/{bin,doc/git-fast-export} $l - mv *.txt $out/doc/git-fast-export sed -i "s@ROOT=.*@ROOT=$l@" *.sh mv *.sh $out/bin mv *.py $l From 296dbc8279c96da93ccbbbf917b8599ee88fcc1f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 29 Sep 2013 00:29:26 +0200 Subject: [PATCH 44/44] OpenTTD: 1.3.2 & some coding-style fixes. Signed-off-by: Moritz Ulrich --- pkgs/games/openttd/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 616adf002243..bf9f6d1060e4 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig}: +{ stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig }: stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.2.2"; + version = "1.3.2"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "158znfx389bhs9gd2hadnbc2a32z4ma1vz8704cmw9yh0fmhbcap"; + sha256 = "02r7xfq9a5x1y2wpdhqyczaj48z0qan33hs4i2liahsg1k6w1vzn"; }; - buildInputs = [SDL libpng pkgconfig xz zlib freetype fontconfig]; + buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; prefixKey = "--prefix-dir="; - configureFlags = '' - --with-zlib=${zlib}/lib/libz.a - --without-liblzo2 - ''; + configureFlags = [ + "--with-zlib=${zlib}/lib/libz.a" + "--without-liblzo2" + ]; makeFlags = "INSTALL_PERSONAL_DIR="; @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; + description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe"''; longDescription = '' OpenTTD is a transportation economics simulator. In single player mode, - players controll a transportation business, and use rail, road, sea, and air - transport to move goods and people around the simulated world. + players control a transportation business, and use rail, road, sea, and air + transport to move goods and people around the simulated world. In multiplayer networked mode, players may: - play competitively as different businesses @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.openttd.org/; license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ]; }; }