From 239c243b0ee4e85e303b0998af56977e24abaf5c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 18 Nov 2010 13:59:25 +0000 Subject: [PATCH 01/16] Updated vice to version 2.2 svn path=/nixpkgs/trunk/; revision=24756 --- pkgs/misc/emulators/vice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 6a0eb402001..293fe43d065 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "vice-2.1"; + name = "vice-2.2"; src = fetchurl { - url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz; - sha256 = "dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66"; + url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz; + sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x"; }; buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa pkgconfig gtk SDL autoconf automake ]; From cf8b8064ad0438fd19bf7d96f3840e1419fc14df Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Nov 2010 16:58:18 +0000 Subject: [PATCH 02/16] * Added python-magic. svn path=/nixpkgs/trunk/; revision=24758 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c4595dcd21..b3a39592c78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -886,6 +886,29 @@ rec { }; }; + magic = buildPythonPackage rec { + name = "magic-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz"; + md5 = "397cff81d2502e81fd3830a61ca2ad2c"; + }; + + preConfigure = + '' + # Ensure that the module can find libmagic by hard-coding the + # path to libmagic.so. Maybe there is a nicer way. + substituteInPlace magic.py --replace \ + "ctypes.util.find_library('magic')" \ + "'${pkgs.file}/lib/libmagic.so'" + ''; + + meta = { + description = "A Python wrapper around libmagic"; + homepage = https://github.com/ahupp/python-magic; + }; + }; + setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; From 63321806b4f0f4506637f006d85b69869c34fd91 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Fri, 19 Nov 2010 04:09:22 +0000 Subject: [PATCH 03/16] Updating pygobject to latest version svn path=/nixpkgs/trunk/; revision=24763 --- pkgs/development/python-modules/pygobject/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 303bb36a3a8..4ef851f5b3e 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "pygobject-2.26.0"; + name = "pygobject-2.27.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.26/${name}.tar.bz2"; - sha256 = "5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7"; + url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.27/${name}.tar.bz2"; + sha256 = "18mq4mj9s9sw12m6gbbc4iffrq993c7q09v9yahlnamrqn3bv53m"; }; configureFlags = "--disable-introspection"; From 165a3df7f5e8b1790b63d8b489cff6c7f844b2fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Nov 2010 10:39:48 +0000 Subject: [PATCH 04/16] * Update nixSqlite. svn path=/nixpkgs/trunk/; revision=24764 --- pkgs/tools/package-management/nix/sqlite.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index be9dfeec6c4..793fc57350a 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre23559"; + name = "nix-1.0pre24749"; src = fetchurl { - url = "http://hydra.nixos.org/build/614186/download/4/${name}.tar.bz2"; - sha256 = "5c7fd783effc9c570f6feb5631f94e369a37de6b4fb2f51459964e48c465dcfa"; + url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2"; + sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970"; }; - buildInputs = [ perl curl openssl ]; + buildInputs = [ perl curl openssl pkgconfig boehmgc ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2} --with-sqlite=${sqlite} --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c8449049f6..df5a441a50f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7070,8 +7070,7 @@ let }; # The SQLite branch. - nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { - inherit fetchurl stdenv perl curl bzip2 openssl sqlite; + nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }); From 5062aa0be016fdea95050ec52bbf66a8590b9bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 19 Nov 2010 13:03:35 +0000 Subject: [PATCH 05/16] Updating fossil. svn path=/nixpkgs/trunk/; revision=24769 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index b1827711ee6..c02d3c68fde 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: let - version = "20101101142335"; + version = "20101117133825"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "129a2zf5zpq397nmmmk31k1yhkgvrssgrh9z4aaj6lh50s3ax0bh"; + sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn"; }; buildInputs = [ zlib openssl ]; From d2338190214d1d3271030e4296a1bc5dac2f28ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 19 Nov 2010 13:05:39 +0000 Subject: [PATCH 06/16] Bumped ghc-7.0.1 from rc2 to released version. svn path=/nixpkgs/trunk/; revision=24770 --- pkgs/development/compilers/ghc/7.0.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix index 6c4454ae3b5..d8acc306510 100644 --- a/pkgs/development/compilers/ghc/7.0.1.nix +++ b/pkgs/development/compilers/ghc/7.0.1.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: stdenv.mkDerivation rec { - version = "7.0.1-rc2"; + version = "7.0.1"; name = "ghc-${version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; src = fetchurl { - url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20101028-src.tar.bz2"; - sha256 = "6048eb94163c96b99094960fe2e5ddd1053594323ba80548dabf50c62c1b7b71"; + url = "http://new-www.haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "1iciljngxmqy465cw3pkl6jp0ydiils4bfz6ixfaxk7aqv7r7xsi"; }; buildInputs = [ghc perl gmp ncurses]; From db8748b170da93feac32d0584b47d7472f419caf Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 19 Nov 2010 13:24:11 +0000 Subject: [PATCH 07/16] added eclipse 3.6.1, maven3, szip svn path=/nixpkgs/trunk/; revision=24772 --- pkgs/applications/editors/eclipse/default.nix | 14 +++++++++++++- pkgs/development/libraries/szip/default.nix | 9 +++++++++ pkgs/misc/maven/3.0.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++++-- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/szip/default.nix create mode 100644 pkgs/misc/maven/3.0.nix diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 937c5df5894..eb12aa0819e 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -98,6 +98,17 @@ stdenv.mkDerivation rec { url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz; sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56"; } + else if v == "3.6.1" then + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz; + sha256 = "1cg9rrb5w978sdqbzz9lnli1lds9zhb6wfsj3wp725bqf1i6v9lg"; + } + else + fetchurl { + url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk.tar.gz; + sha256 = "0s48rjaswi8m5gan1zlqvfwb4l06x5nslkq41wpkrbyj9ka8gh4x"; + } else throw "no source for eclipse version ${v} known"; desktopItem = makeDesktopItem { @@ -131,11 +142,12 @@ stdenv.mkDerivation rec { ensureDir $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + meta = { homepage = http://www.eclipse.org/; description = "A extensible multi-language software development environment"; longDescription = '' ''; }; + } diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix new file mode 100644 index 00000000000..38cde3bfd70 --- /dev/null +++ b/pkgs/development/libraries/szip/default.nix @@ -0,0 +1,9 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "szip-2.1"; + src = fetchurl { + url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; + sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z"; + }; +} \ No newline at end of file diff --git a/pkgs/misc/maven/3.0.nix b/pkgs/misc/maven/3.0.nix new file mode 100644 index 00000000000..f66a2f7f04b --- /dev/null +++ b/pkgs/misc/maven/3.0.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, jdk, makeWrapper}: + +assert jdk != null; + +stdenv.mkDerivation { + name = "apache-maven-3.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz; + sha256 = "18i7vf7w79pvga4k0plixv2ppdvm476cgikaxxnar1fac5v0qsh4"; + }; + + buildInputs = [makeWrapper]; + inherit jdk; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df5a441a50f..d9bb73dca7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -745,7 +745,7 @@ let hddtemp = callPackage ../tools/misc/hddtemp { }; hdf5 = callPackage ../tools/misc/hdf5 { }; - + hevea = callPackage ../tools/typesetting/hevea { }; highlight = callPackage ../tools/text/highlight { }; @@ -3855,6 +3855,8 @@ let sword = callPackage ../development/libraries/sword { }; + szip = callPackage ../development/libraries/szip { }; + t1lib = callPackage ../development/libraries/t1lib { }; taglib = callPackage ../development/libraries/taglib { }; @@ -5462,6 +5464,9 @@ let inherit (gtkLibs216) glib gtk; }; eclipseLatest = eclipse.override { version = "latest"; }; + eclipse36 = callPackage ../applications/editors/eclipse { + version = "3.6.1"; + }; ed = callPackage ../applications/editors/ed { }; @@ -7052,8 +7057,8 @@ let martyr = callPackage ../development/libraries/martyr { }; maven = callPackage ../misc/maven/maven-1.0.nix { }; - maven2 = callPackage ../misc/maven { }; + maven3 = callPackage ../misc/maven/3.0.nix { }; mess = callPackage ../misc/emulators/mess { }; From fcdc36c848f92a684540c628e76c951a3d87fe08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 19 Nov 2010 19:34:41 +0000 Subject: [PATCH 08/16] Added gtk-based plot capabilities for criterion. svn path=/nixpkgs/trunk/; revision=24778 --- .../libraries/haskell/Chart/default.nix | 15 +++++++++++++++ .../libraries/haskell/criterion/default.nix | 10 +++++++--- .../data-accessor/data-accessor-template.nix | 14 ++++++++++++++ .../haskell/data-accessor/data-accessor.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++++ 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/Chart/default.nix create mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix create mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor.nix diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix new file mode 100644 index 00000000000..6e5fdb9b787 --- /dev/null +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -0,0 +1,15 @@ +{cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk, mtl}: + +cabal.mkDerivation (self : { + pname = "Chart"; + version = "0.13.1"; + sha256 = "1gh8qw8xil543wssflhpjrgnig4v79vi7xizrm93a93i4n84npd5"; + propagatedBuildInputs = + [cairo colour dataAccessor dataAccessorTemplate gtk mtl]; + meta = { + description = "A library for generating 2D Charts and Plots"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 0b1cac4076f..ce6b5d5e2dc 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,13 +1,17 @@ {cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms, - mwcRandom, statistics}: + mwcRandom, statistics, Chart, dataAccessor}: cabal.mkDerivation (self : { pname = "criterion"; version = "0.5.0.5"; sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn"; - propagatedBuildInputs = - [deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics]; + propagatedBuildInputs = [ + deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics + Chart dataAccessor + ]; + + configureFlags = "-fchart"; meta = { homepage = "http://bitbucket.org/bos/criterion"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix new file mode 100644 index 00000000000..ff985fbfef8 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -0,0 +1,14 @@ +{cabal, dataAccessor, utilityHt}: + +cabal.mkDerivation (self : { + pname = "data-accessor-template"; + version = "0.2.1.5"; + sha256 = "0fvf1cacvqzyl9x88h7fa0d6p94qhkvf177a84g036qjxn0khyja"; + propagatedBuildInputs = [dataAccessor utilityHt]; + meta = { + description = "Utilities for accessing and manipulating the fields of records"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix new file mode 100644 index 00000000000..99e84244460 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "data-accessor"; + version = "0.2.1.4"; + sha256 = "1fnfbcw1fzas2sbk9yhwd05ncvgqfy47hi9xh0ygsqilx7nwkdxv"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Utilities for accessing and manipulating the fields of records"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9cfb3718c9d..4721c9151b1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -82,6 +82,8 @@ rec { cgi = callPackage ../development/libraries/haskell/cgi {}; + Chart = callPackage ../development/libraries/haskell/Chart {}; + cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; @@ -108,6 +110,10 @@ rec { csv = callPackage ../development/libraries/haskell/csv {}; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; + + dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; + dataenc = callPackage ../development/libraries/haskell/dataenc {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; From 0d38f21c736a515e71f92bf899b57d1023d74ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 19 Nov 2010 23:10:41 +0000 Subject: [PATCH 09/16] Making the fossil build do the check phase. svn path=/nixpkgs/trunk/; revision=24780 --- .../version-management/fossil/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c02d3c68fde..050e7c6b56f 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl}: +{stdenv, fetchurl, zlib, openssl, tcl}: let version = "20101117133825"; @@ -12,7 +12,16 @@ stdenv.mkDerivation { sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn"; }; - buildInputs = [ zlib openssl ]; + buildInputs = [ zlib openssl tcl ]; + buildNativeInputs = [ zlib openssl ]; + + doCheck = true; + + checkTarget = "test"; + + crossAttrs = { + doCheck = false; + }; installPhase = '' ensureDir $out/bin From 25423cc5462e2bbb0f93c0a0ff60b3b1ac1c0759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 19 Nov 2010 23:10:45 +0000 Subject: [PATCH 10/16] Making hydra build fossil svn path=/nixpkgs/trunk/; revision=24781 --- pkgs/applications/version-management/fossil/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 050e7c6b56f..df23004edb5 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -39,8 +39,10 @@ stdenv.mkDerivation { ''; homepage = http://www.fossil-scm.org/; license = "GPLv2"; + platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.viric ]; }; } From 331f7efbf5860d4752715b75b60a3d115903cf77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 19 Nov 2010 23:10:49 +0000 Subject: [PATCH 11/16] Updating the fossil license (they changed it to BSD some months ago) svn path=/nixpkgs/trunk/; revision=24782 --- pkgs/applications/version-management/fossil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index df23004edb5..b01d6e7ad0f 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "GPLv2"; + license = "BSD"; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z From 65b669feb88a629ef88c74997a42c78fdfb9c4f3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 20 Nov 2010 10:41:53 +0000 Subject: [PATCH 12/16] VirtualBox: fix i686 compilation svn path=/nixpkgs/trunk/; revision=24783 --- .../browsers/mozilla-plugins/flashplayer-10/default.nix | 2 +- pkgs/applications/virtualization/virtualbox/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 923fa3e6bcc..c20848eb2da 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -54,7 +54,7 @@ let } else { version = "10.1.102.64"; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "1bx3cbls40si3l3x6ahncbn8dwrr41gj34hfn51k5ak9ccqn27wg"; + sha256 = "1jfk9va3id0m6q6csg6gfycmryvi7kylbb7dswpsh6zh1zv00s62"; } else throw "flashplayer is not supported on this platform"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 13b523648c5..5d89d33a81b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ -i Config.kmk + substituteInPlace Config.kmk --replace "VBOX_WITH_TESTCASES = 1" "#" cat >> AutoConfig.kmk << END_PATHS VBOX_PATH_APP_PRIVATE := $out VBOX_PATH_APP_DOCS := $out/doc From 79c06ac9124316a32642365e1391598dbff38a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 20 Nov 2010 14:48:23 +0000 Subject: [PATCH 13/16] Updating qemu svn path=/nixpkgs/trunk/; revision=24784 --- .../virtualization/qemu/{0.12.3.nix => 0.13.nix} | 6 ++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/applications/virtualization/qemu/{0.12.3.nix => 0.13.nix} (69%) diff --git a/pkgs/applications/virtualization/qemu/0.12.3.nix b/pkgs/applications/virtualization/qemu/0.13.nix similarity index 69% rename from pkgs/applications/virtualization/qemu/0.12.3.nix rename to pkgs/applications/virtualization/qemu/0.13.nix index a16a4d58729..0c20884b0df 100644 --- a/pkgs/applications/virtualization/qemu/0.12.3.nix +++ b/pkgs/applications/virtualization/qemu/0.13.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, SDL, zlib, which}: stdenv.mkDerivation rec { - name = "qemu-0.12.3"; + name = "qemu-0.13.0"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/qemu/${name}.tar.gz"; - sha256 = "0jyyz9vm8qrjb6nzfgdwmj9y990fnk2bl9ja0sr1i555n27nzqiw"; + sha256 = "0xyqbwy78218ja6r9ya5p37j8hcd81l4cpw3ghvnxsjwn18mhvqy"; }; - - patchFlags = "-p2"; buildInputs = [SDL zlib which]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9bb73dca7e..fa3afc07aad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6152,7 +6152,7 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qemu = callPackage ../applications/virtualization/qemu/0.12.3.nix { }; + qemu = callPackage ../applications/virtualization/qemu/0.13.nix { }; qemuSVN = callPackage ../applications/virtualization/qemu/svn-6642.nix { }; From 6a9414d9383e9417a04b0bf8c13fc1d35acefb12 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 22 Nov 2010 08:40:10 +0000 Subject: [PATCH 14/16] Adding dd_rescue - this is not the same as GNU ddrescue which has not been updated for a long time svn path=/nixpkgs/trunk/; revision=24801 --- pkgs/tools/system/dd_rescue/default.nix | 63 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/system/dd_rescue/default.nix diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix new file mode 100644 index 00000000000..b018de88f46 --- /dev/null +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -0,0 +1,63 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="dd_rescue"; + version="1.22"; + name="${baseName}-${version}"; + url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; + hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + dd_rhelp_src = a.fetchurl { + url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz"; + sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv"; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"]; + makeFlags=[ + ''prefix="$out"'' + ''DESTDIR="$out"'' + ''INSTASROOT='' + ]; + + fixPaths = a.doPatchShebangs ''$out/bin''; + + install_dd_rhelp = a.fullDepEntry ('' + ensureDir "$out/share/dd_rescue" "$out/bin" + tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" + cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" + '') ["minInit" "defEnsureDir"]; + + meta = { + description = "A tool to copy data from a damaged block device"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa3afc07aad..ac1aab8064c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,6 +533,8 @@ let ddclient = callPackage ../tools/networking/ddclient { }; + dd_rescue = callPackage ../tools/system/dd_rescue { }; + ddrescue = callPackage ../tools/system/ddrescue { }; desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; From b9a119647939846ee6bd04c1be7b565950890604 Mon Sep 17 00:00:00 2001 From: Tobias Hammerschmidt Date: Mon, 22 Nov 2010 08:58:00 +0000 Subject: [PATCH 15/16] jdk5 updated to 1.5.22 svn path=/nixpkgs/trunk/; revision=24802 --- pkgs/development/compilers/jdk/default-5.nix | 2 +- .../compilers/jdk/jdk5-oracle-linux.nix | 26 +++++++++++++++++++ .../compilers/jdk/jdk5-sun-linux.nix | 24 ----------------- 3 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/compilers/jdk/jdk5-oracle-linux.nix delete mode 100644 pkgs/development/compilers/jdk/jdk5-sun-linux.nix diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix index 9fb52378b3f..fb25cd704c4 100644 --- a/pkgs/development/compilers/jdk/default-5.nix +++ b/pkgs/development/compilers/jdk/default-5.nix @@ -2,7 +2,7 @@ if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then - (import ./jdk5-sun-linux.nix) { + (import ./jdk5-oracle-linux.nix) { inherit stdenv fetchurl unzip; } else diff --git a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix new file mode 100644 index 00000000000..06471c482a1 --- /dev/null +++ b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix @@ -0,0 +1,26 @@ +/** + * This Nix expression requires the user to download the Java 5.0 JDK + * distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for + * 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems + * from java.sun.com (look for archived software downloads) + * by hand and place it in /tmp. Blame Oracle, not me. + * + * Note that this is not necessary if someone has already pushed a + * binary. + */ +{stdenv, fetchurl, unzip}: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + +let name = "jdk-1_5_0_22"; in +stdenv.mkDerivation { + inherit name; + filename = "jdk-1_5_0_22"; + dirname = "jdk1.5.0_22"; + builder = ./builder.sh; + pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin"; + md5 = if stdenv.system == "x86_64-linux" then "b62abcaf9ea8617c50fa213bbc88824a" else "df5dae6d50d2abeafb472dde6d9a17f3"; + + stdenv = stdenv; + inherit unzip; +} diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix deleted file mode 100644 index 3e3742c33f3..00000000000 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain jdk-1_5_0_14-linux-i586.bin - * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. - * - * Note that this is not necessary if someone has already pushed a - * binary. - */ -{stdenv, fetchurl, unzip}: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -let name = "jdk-1_5_0_19"; in -stdenv.mkDerivation { - inherit name; - filename = "jdk-1_5_0_19"; - dirname = "jdk1.5.0_19"; - builder = ./builder.sh; - pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin"; - md5 = if stdenv.system == "x86_64-linux" then "28095941e14669d5025f66260e7b61e7" else "0d082a0c9f5a79b0895b3317c9590ec5"; - - stdenv = stdenv; - inherit unzip; -} From e8320167d2dba24668302a3d7edc4e4b9a015e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Nov 2010 09:03:22 +0000 Subject: [PATCH 16/16] Updating valgrind to 3.6.0 svn path=/nixpkgs/trunk/; revision=24803 --- .../tools/analysis/valgrind/default.nix | 9 +--- .../tools/analysis/valgrind/glibc-2.11.patch | 53 ------------------- 2 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/tools/analysis/valgrind/glibc-2.11.patch diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index fdf2bf1777f..3de750c028a 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,18 +1,13 @@ { stdenv, fetchurl, perl, gdb, autoconf, automake }: stdenv.mkDerivation rec { - name = "valgrind-3.5.0"; + name = "valgrind-3.6.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl"; + sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw"; }; - # Make Valgrind compile with Glibc 2.11. - patches = [ ./glibc-2.11.patch ]; - patchFlags = "-p0"; - preConfigure = "autoreconf"; - # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. buildInputs = [ perl autoconf automake ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch deleted file mode 100644 index e2ce53217c9..00000000000 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch +++ /dev/null @@ -1,53 +0,0 @@ -r10941 from svn://svn.valgrind.org/valgrind/trunk - ------------------------------------------------------------------------- -r10941 | bart | 2009-11-15 20:11:19 +0100 (Sun, 15 Nov 2009) | 2 lines - -Added support for glibc 2.11. - ------------------------------------------------------------------------- - -Index: configure.in -=================================================================== ---- configure.in (revision 10940) -+++ configure.in (revision 10941) -@@ -656,6 +656,16 @@ - ], - GLIBC_VERSION="2.10") - -+AC_EGREP_CPP([GLIBC_211], [ -+#include -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) -+ GLIBC_211 -+ #endif -+#endif -+], -+GLIBC_VERSION="2.11") -+ - AC_EGREP_CPP([AIX5_LIBC], [ - #include - #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) -@@ -742,6 +752,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.11) -+ AC_MSG_RESULT(2.11 family) -+ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) - AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) -@@ -755,7 +772,7 @@ - - *) - AC_MSG_RESULT(unsupported version) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;;