From 8c63762d643e371d892fbd6a264e8057c880e60d Mon Sep 17 00:00:00 2001 From: Michael Ashton Date: Sun, 31 Mar 2013 19:00:50 -0700 Subject: [PATCH 1/5] - fetchbzr and nix-prefetch-bzr now only export, instead of cloning - The option for cloning in nix-prefetch-bzr is removed - ssl certificates are now ignored by fetchbzr This means that no .bzr directory is downloaded. Without this change, the hash of the result is unpredictable, probably because of timestamping in the .bzr directory. Currently, the only package using fetchbzr is kicad. --- pkgs/build-support/fetchbzr/builder.sh | 2 +- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 88aab7891b4..17567fdadd2 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. -bzr checkout --lightweight "$url" -r "$revision" "$out" +bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url" stopNest diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index 167892fbb79..9ff86c20ae3 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -50,12 +50,7 @@ if test -z "$finalPath"; then trap "rm -rf $tmpPath" EXIT # Perform the checkout. - if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1 - then - bzr export $revarg "$tmpFile" "$url" >&2 - else - bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2 - fi + bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url" # Compute the hash. hash=$(nix-hash --type $hashType $hashFormat $tmpFile) From 7b01680d87272bd4edcdeaa8095983e020bd3b3a Mon Sep 17 00:00:00 2001 From: Michael Ashton Date: Sun, 31 Mar 2013 19:11:21 -0700 Subject: [PATCH 2/5] kicad: upgrade to stable version 20130325, libraries to r220 - changed to require wxWidgets 2.9 -- seems to satisfy requirement for libgtkprint, even with gtk2 --- .../science/electronics/kicad/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index d90c6632916..cc53611493d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11, -gettext}: +{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11, +gettext, cups } : stdenv.mkDerivation rec { - name = "kicad-20110708"; + name = "kicad-20130325"; src = fetchurl { - url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip; - sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a"; + url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip"; + sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m"; }; srcLibrary = fetchbzr { url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; - revision = 112; - sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312"; + revision = 220; + sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb"; }; cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4afbe4b9e2..986bfed5b23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8758,7 +8758,9 @@ let gtkwave = callPackage ../applications/science/electronics/gtkwave { }; - kicad = callPackage ../applications/science/electronics/kicad { }; + kicad = callPackage ../applications/science/electronics/kicad { + wxGTK = wxGTK29; + }; ngspice = callPackage ../applications/science/electronics/ngspice { }; From cb4ae7759ec3e3d93b59cec88f9f74fdce27f79c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Apr 2013 18:47:19 +0200 Subject: [PATCH 3/5] haskell-xml: update to version 1.3.13 --- pkgs/development/libraries/haskell/xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 8a8e6e3e2ad..126ab9b1f08 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml"; - version = "1.3.12"; - sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai"; + version = "1.3.13"; + sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3"; buildDepends = [ text ]; meta = { homepage = "http://code.galois.com"; From 62d7abf42ab21aed07e30a1833ef32be6c2d57a0 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 1 Apr 2013 22:55:16 +0200 Subject: [PATCH 4/5] flexget: run time dependency on deluge (plugin) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29f2e181f3d..6dc8d029821 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1485,7 +1485,7 @@ pythonPackages = python.modules // rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ]; + propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ]; meta = { homepage = http://flexget.com/; From 934bfc618a379aaad5d24fdb3bc46358ff832a2a Mon Sep 17 00:00:00 2001 From: Cameron Matheson Date: Mon, 1 Apr 2013 16:24:08 -0600 Subject: [PATCH 5/5] tmux: update to version 1.8 --- pkgs/tools/misc/tmux/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 435b9cdcee9..272656349f6 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -2,21 +2,16 @@ stdenv.mkDerivation rec { pname = "tmux"; - version = "1.7"; + version = "1.8"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0ywy1x2g905hmhkdz418ik42lcvnhnwr8fv63rcqczfg27d6nd38"; + sha256 = "f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44"; }; nativeBuildInputs = [ pkgconfig ]; - # There's a bug in tmux's configure script, --disable-static actually enables it - # Fixed upstream in revision ThomasAdam/tmux@e964ff70e696f30f0301d11deb45c8ada54e0c55 - # Remove on next update - dontDisableStatic = true; - buildInputs = [ ncurses libevent ]; meta = {