From 85a33507ea5c5f831d5bf0fcf961fa7de618215b Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 03:38:13 +0100 Subject: [PATCH 01/91] Add GROMACS v4.5.5 --- .../molecular-dynamics/gromacs/4.5.5.nix | 26 ++++++++++++++++++ .../molecular-dynamics/gromacs/default.nix | 2 ++ .../molecular-dynamics/gromacs/meta.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 +++++++++++ 4 files changed, 70 insertions(+) create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/default.nix create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/meta.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix new file mode 100644 index 000000000000..0cb9b4c2c65c --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix @@ -0,0 +1,26 @@ + +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +let meta = import ./meta.nix; +in + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + inherit meta; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix new file mode 100644 index 000000000000..ac5628bcdf87 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -0,0 +1,2 @@ + +import ./4.5.5.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix new file mode 100644 index 000000000000..fa6a041f7195 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix @@ -0,0 +1,27 @@ + + + +meta = { + homepage = "www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: www.gromacs.org/About_Gromacs + ''; +}; \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede3e1eb1759..97f3538d10d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8661,6 +8661,21 @@ let openblas = callPackage ../development/libraries/science/math/openblas { }; + + ### SCIENCE/MOLECULAR-DYNAMICS + + gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { + singlePrec = true; + fftw = fftwSinglePrec; + cmake = cmakeCurses; + }; + + gromacsDouble = callPackage ../applications/science/molecular-dynamics/gromacs { + singlePrec = false; + fftw = fftw; + cmake = cmakeCurses; + }; + ### SCIENCE/LOGIC coq = callPackage ../applications/science/logic/coq { From 7bdcb521b27b460c3c1a8fac327bffae3f72be7a Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:29:17 +0100 Subject: [PATCH 02/91] Update based on comments to pull request --- .../molecular-dynamics/gromacs/4.5.5.nix | 26 ---------- .../molecular-dynamics/gromacs/default.nix | 49 ++++++++++++++++++- .../molecular-dynamics/gromacs/meta.nix | 27 ---------- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 50 insertions(+), 56 deletions(-) delete mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix delete mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/meta.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix deleted file mode 100644 index 0cb9b4c2c65c..000000000000 --- a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix +++ /dev/null @@ -1,26 +0,0 @@ - -{ stdenv, fetchurl, cmake, - singlePrec ? true, - fftw -}: - - -let meta = import ./meta.nix; -in - -stdenv.mkDerivation { - name = "gromacs-4.5.5"; - - src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; - md5 = "6a87e7cdfb25d81afa9fea073eb28468"; - }; - - buildInputs = [cmake fftw]; - - cmakeFlags = '' - ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} - ''; - - inherit meta; -} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index ac5628bcdf87..d6fe326a9d17 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,2 +1,49 @@ -import ./4.5.5.nix +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +let meta = import ./meta.nix; +in + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + meta = { + homepage = "http://www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: http://www.gromacs.org/About_Gromacs for details. + ''; + }; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix deleted file mode 100644 index fa6a041f7195..000000000000 --- a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix +++ /dev/null @@ -1,27 +0,0 @@ - - - -meta = { - homepage = "www.gromacs.org"; - licence = "GPLv2"; - description = "The GROMACS molecular dynamics software package"; - longDescription = '' - GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems - with hundreds to millions of particles. - - It is primarily designed for biochemical molecules like - proteins, lipids and nucleic acids that have a lot of - complicated bonded interactions, but since GROMACS is - extremely fast at calculating the nonbonded interactions (that - usually dominate simulations) many groups are also using it - for research on non-biological systems, e.g. polymers. - - GROMACS supports all the usual algorithms you expect from a - modern molecular dynamics implementation, (check the online - reference or manual for details), but there are also quite a - few features that make it stand out from the competition. - - See: www.gromacs.org/About_Gromacs - ''; -}; \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78dc5c8776eb..342b7e7af9cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8668,11 +8668,11 @@ let cmake = cmakeCurses; }; - gromacsDouble = callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = false; fftw = fftw; cmake = cmakeCurses; - }; + }); ### SCIENCE/LOGIC From cba15c96f6813c6c15961236602619fab67ca1ed Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:45:19 +0100 Subject: [PATCH 03/91] fix skipped indentation --- .../applications/science/molecular-dynamics/gromacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d6fe326a9d17..ea4855e26d76 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { reference or manual for details), but there are also quite a few features that make it stand out from the competition. - See: http://www.gromacs.org/About_Gromacs for details. + See: http://www.gromacs.org/About_Gromacs for details. ''; }; } From 06c522f7391df7ea8e8707f1f15af18300d287a1 Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:46:49 +0100 Subject: [PATCH 04/91] remove reference to meta.nix --- .../science/molecular-dynamics/gromacs/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index ea4855e26d76..c687fd5908c4 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -5,9 +5,6 @@ }: -let meta = import ./meta.nix; -in - stdenv.mkDerivation { name = "gromacs-4.5.5"; From d50712e376c2b01a6c2771f19206a11e7e8715ca Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 25 Nov 2012 13:00:12 +0100 Subject: [PATCH 05/91] Add despotify --- .../libraries/despotify/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/despotify/default.nix diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix new file mode 100644 index 000000000000..13732d34e093 --- /dev/null +++ b/pkgs/development/libraries/despotify/default.nix @@ -0,0 +1,34 @@ +{ + stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao, + libtool, ncurses, glibc +}: + +stdenv.mkDerivation rec { + + name = "despotify"; + + src = fetchsvn { + url = "https://despotify.svn.sourceforge.net/svnroot/despotify"; + rev = "521"; + }; + + buildInputs = [ + openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc + ]; + + configurePhase = "cd src"; + + installPhase = "make LDCONFIG=true INSTALL_PREFIX=$out install"; + + meta = { + description = "Open source Spotify client and library"; + longDescription = '' + despotify is a open source implementation of the Spotify API. This + package provides both a library and a few already quite useful, + proof-of-concept clients. + ''; + homepage = "http://despotify.se"; + license = stdenv.lib.licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a7200498489..30f6d5ab1a88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -614,6 +614,8 @@ let desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; + despotify = callPackage ../development/libraries/despotify { }; + dev86 = callPackage ../development/compilers/dev86 { /* Using GNU Make 3.82 leads to this: make[4]: *** No rule to make target `__ldivmod.o)' From ee6f7e294eaa5c907e57a7c9079d8008645d0de3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:55:54 +0100 Subject: [PATCH 06/91] zathura: Update to 0.2.1 (also update plugins to latest) --- pkgs/applications/misc/girara/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/default.nix | 2 +- pkgs/applications/misc/zathura/djvu/default.nix | 4 ++-- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 4 ++-- pkgs/applications/misc/zathura/ps/default.nix | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 2fa36b33eb06..73db728b1a63 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.1.2"; + name = "girara-0.1.4"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 0c58965fc19f..6c3ff038c74a 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "0.1.2"; + version = "0.2.1"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef"; + sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790"; }; buildInputs = [ pkgconfig gtk girara gettext ]; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index b5ba4f9ada75..5ed445b6984d 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -13,7 +13,7 @@ rec { zathuraWrapper = stdenv.mkDerivation rec { - name = "zathura-0.1.2"; + name = "zathura-${zathura_core.version}"; plugins_path = stdenv.lib.makeSearchPath "lib" [ zathura_pdf_poppler diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c4656e732364..bddb3471bfe6 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.1.1"; + name = "zathura-djvu-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172"; + sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 17e00b4e6220..e0fcb0573a48 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: stdenv.mkDerivation rec { - name = "zathura-pdf-poppler-0.1.1"; + name = "zathura-pdf-poppler-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7"; + sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd"; }; buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index ae9aeee7715e..7f70eb952e11 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.1.0"; + name = "zathura-ps-0.2.0"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789"; + sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414"; }; buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; From b47b2e4f0b98172891f2fedc3234b3952eb7018d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:57:58 +0100 Subject: [PATCH 07/91] notmuch: sha256 was wrong --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c518f0430ff3..9d7126452c9a 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9"; + sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; From d9e097875c89a0fe958e85806ccfa1a660a386e0 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:58:25 +0100 Subject: [PATCH 08/91] pythonPackages.flake8: Update to 1.6.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b864737d1635..cfccd5b803e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -705,11 +705,11 @@ let pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.5"; + name = "flake8-1.6.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "525be5c7fcaf85f6819c77752cb2ee72"; + md5 = "abfdbb25d37c28e9da05f1b5c3596d1a"; }; doCheck = false; From 61d6ab05c506fd5b74ec1ed924ea11ab8d38204e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:59:38 +0100 Subject: [PATCH 09/91] boost: wrong unpacking command --- pkgs/development/libraries/boost/1.52-headers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix index b89273fdd305..72a4b419f2d5 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost + tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost ''; meta = { From fdf3ff7a21c5d0b5c45bc889ea1d3a33f9b48c7b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 19:20:06 +0100 Subject: [PATCH 10/91] pythonPackages.turses: update to 0.2.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfccd5b803e7..ddd25ad03b2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2774,11 +2774,11 @@ let pythonPackages = python.modules // rec { }; turses = buildPythonPackage (rec { - name = "turses-0.2.8"; + name = "turses-0.2.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "fbbc0ca93324535bcafa8434395caded8047e40c25d7a4004806415dd6ca023f"; + sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ]; From f8f54dc8d358963deaf1521f68d2c3d01fb6d664 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Nov 2012 23:57:49 +0400 Subject: [PATCH 11/91] Allow to skip more options to update-walker in simple cases. Now just an URL can work if everything is set up in default way --- .../upstream-updater/update-walker.sh | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index ce0e1403f2ed..78c61dd2b82a 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -3,6 +3,7 @@ own_dir="$(cd "$(dirname "$0")"; pwd)" CURRENT_URL= +NEED_TO_CHOOSE_URL=1 url () { CURRENT_URL="$1" @@ -45,12 +46,14 @@ matching_links () { link () { CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")" + unset NEED_TO_CHOOSE_URL echo "Linked by: $*" echo "URL: $CURRENT_URL" >&2 } version_link () { CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")" + unset NEED_TO_CHOOSE_URL echo "Linked version by: $*" echo "URL: $CURRENT_URL" >&2 } @@ -86,6 +89,23 @@ ensure_target () { [ -z "$CURRENT_TARGET" ] && target default.nix } +ensure_name () { + [ -z "$CURRENT_NAME" ] && name "$(basename "$CONFIG_DIR")" + echo "Resulting name: $CURRENT_NAME" +} + +ensure_choice () { + [ -n "NEED_TO_CHOOSE_URL" ] && { + version_link '[.]tar[.]([^./])+$' + unset NEED_TO_CHOOSE_URL + } + [ -z "$CURRENT_URL" ] && { + echo "Error: empty CURRENT_URL" + echo "Error: empty CURRENT_URL" >&2 + exit 1 + } +} + hash () { CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")" } @@ -183,9 +203,11 @@ do_overwrite () { process_config () { CONFIG_DIR="$(directory_of "$1")" - source "$CONFIG_DIR/$(basename "$1")" BEGIN_EXPRESSION='# Generated upstream information'; + source "$CONFIG_DIR/$(basename "$1")" + ensure_name retrieve_version + ensure_choice ensure_version ensure_target update_found && do_overwrite "$CURRENT_TARGET" From 7333c01dbab997ba1fbedcf48e394e597383e64d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Nov 2012 23:58:04 +0400 Subject: [PATCH 12/91] Update Compiz --- .../window-managers/compiz/bcop.nix | 17 ------ .../window-managers/compiz/ccsm.nix | 31 ---------- .../window-managers/compiz/config-python.nix | 20 ------- .../window-managers/compiz/core.nix | 40 ------------- .../window-managers/compiz/default.nix | 51 ++++++++++++++++ .../window-managers/compiz/default.upstream | 1 + .../compiz/gdk-deprecated.patch | 14 ----- .../compiz/libcompizconfig.nix | 22 ------- .../compiz/plugindir-core.patch | 39 ------------- .../compiz/plugindir-libcompizconfig.patch | 39 ------------- .../window-managers/compiz/plugins-extra.nix | 30 ---------- .../window-managers/compiz/plugins-main.nix | 22 ------- .../compiz/wallpaper-maxpect.patch | 58 ------------------- .../tools/misc/intltool/default.nix | 30 ++++++++++ .../tools/misc/intltool/default.upstream | 1 + pkgs/top-level/all-packages.nix | 18 ++---- 16 files changed, 88 insertions(+), 345 deletions(-) delete mode 100644 pkgs/applications/window-managers/compiz/bcop.nix delete mode 100644 pkgs/applications/window-managers/compiz/ccsm.nix delete mode 100644 pkgs/applications/window-managers/compiz/config-python.nix delete mode 100644 pkgs/applications/window-managers/compiz/core.nix create mode 100644 pkgs/applications/window-managers/compiz/default.nix create mode 100644 pkgs/applications/window-managers/compiz/default.upstream delete mode 100644 pkgs/applications/window-managers/compiz/gdk-deprecated.patch delete mode 100644 pkgs/applications/window-managers/compiz/libcompizconfig.nix delete mode 100644 pkgs/applications/window-managers/compiz/plugindir-core.patch delete mode 100644 pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch delete mode 100644 pkgs/applications/window-managers/compiz/plugins-extra.nix delete mode 100644 pkgs/applications/window-managers/compiz/plugins-main.nix delete mode 100644 pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch create mode 100644 pkgs/development/tools/misc/intltool/default.nix create mode 100644 pkgs/development/tools/misc/intltool/default.upstream diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix deleted file mode 100644 index 254393d4c7fc..000000000000 --- a/pkgs/applications/window-managers/compiz/bcop.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxslt }: - -stdenv.mkDerivation rec { - name = "compiz-bcop-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2"; - sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk"; - }; - - buildInputs = [ pkgconfig libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Code generator for Compiz plugins"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix deleted file mode 100644 index 0406a170d190..000000000000 --- a/pkgs/applications/window-managers/compiz/ccsm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, intltool, gtk -, python, pygtk, pygobject, pycairo, compizconfig_python }: - -stdenv.mkDerivation rec { - name = "ccsm-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2"; - sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6"; - }; - - buildInputs = [ makeWrapper python intltool gtk ]; - - buildPhase = "python setup.py build --prefix=$out"; - - pythonDeps = [ pygtk pygobject pycairo compizconfig_python ]; - - installPhase = - '' - python setup.py install --prefix=$out - - wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \ - "$(toPythonPath "$pythonDeps $out")" - ''; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz settings manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix deleted file mode 100644 index 4de7fb41a488..000000000000 --- a/pkgs/applications/window-managers/compiz/config-python.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib -, python, pyrex }: - -stdenv.mkDerivation rec { - name = "compizconfig-python-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2"; - sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37"; - }; - - buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ]; - - NIX_LDFLAGS = "-lcompizconfig"; - - meta = { - homepage = http://www.compiz.org/; - description = "Python interface to the Compiz configuration"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix deleted file mode 100644 index d4a5b79b7fb3..000000000000 --- a/pkgs/applications/window-managers/compiz/core.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt -, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }: - -let version = "0.8.6"; in - -stdenv.mkDerivation { - name = "compiz-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2"; - sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4"; - }; - - patches = - [ # Allow the path to the Compiz plugin library and metadata - # directories to be overriden through $COMPIZ_PLUGINDIR and - # $COMPIZ_METADATADIR, respectively. - ./plugindir-core.patch - - # Fix compilation with recent GTK versions. - ./gdk-deprecated.patch - ]; - - buildInputs = - [ intltool pkgconfig libpng glib - gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2 - ]; - - propagatedBuildInputs = - [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender - xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama - libstartup_notification mesa libxml2 libxslt - ]; - - meta = { - homepage = http://www.compiz.org/; - description = "A compositing window manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix new file mode 100644 index 000000000000..63a1894f9b6b --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, cmake, pkgconfig +, libXrender, renderproto, gtk, libwnck, pango, cairo +, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm +, libstartup_notification, libpthreadstubs, libxcb, intltool +, ORBit2, libXau +, dbus, dbus_glib, librsvg, mesa +, libXdmcp, libnotify, python +, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus +, xdg_utils +, gettext, boost, pyrex +}: +let + s = # Generated upstream information + rec { + baseName="compiz"; + version="0.9.8.6"; + name="compiz-0.9.8.6"; + hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2"; + sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + }; + buildInputs = [cmake pkgconfig + libXrender renderproto gtk libwnck pango cairo + GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification + libpthreadstubs libxcb intltool + ORBit2 libXau + dbus dbus_glib librsvg mesa + libXdmcp libnotify python + hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus + xdg_utils + gettext boost pyrex + ]; + in +stdenv.mkDerivation rec { + inherit (s) name version; + src = fetchurl { + inherit (s) url sha256; + }; + inherit buildInputs; + + NIX_CFLAGS_COMPILE=" -Wno-error "; + + meta = { + description = "Compoziting window manager"; + homepage = "http://launchpad.net/compiz/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + inherit (s) version; + }; +} diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream new file mode 100644 index 000000000000..b7fc98bd1263 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.upstream @@ -0,0 +1 @@ +url https://launchpad.net/compiz/+download diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch deleted file mode 100644 index d80a5514ee9d..000000000000 --- a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 -@@ -31,10 +31,6 @@ - #include - #include - --#ifndef GDK_DISABLE_DEPRECATED --#define GDK_DISABLE_DEPRECATED --#endif -- - #ifndef GTK_DISABLE_DEPRECATED - #define GTK_DISABLE_DEPRECATED - #endif diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix deleted file mode 100644 index 51d459e7a366..000000000000 --- a/pkgs/applications/window-managers/compiz/libcompizconfig.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }: - -stdenv.mkDerivation rec { - name = "libcompizconfig-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2"; - sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1"; - }; - - patches = - [ # See ./core.nix. - ./plugindir-libcompizconfig.patch - ]; - - buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz configuration library"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch deleted file mode 100644 index 5a242e66088f..000000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-core.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c ---- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200 -@@ -146,7 +146,7 @@ - compAddMetadataFromFile (CompMetadata *metadata, - const char *file) - { -- char *home; -+ char *home, *metadatadir; - Bool status = FALSE; - - home = getenv ("HOME"); -@@ -163,7 +163,10 @@ - } - } - -- status |= addMetadataFromFilename (metadata, METADATADIR, file); -+ metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ status |= addMetadataFromFilename (metadata, metadatadir, file); - if (!status) - { - compLogMessage ("core", CompLogLevelWarn, -diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c ---- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200 -@@ -579,7 +579,10 @@ - } - } - -- status = (*loaderLoadPlugin) (p, PLUGINDIR, name); -+ plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ -+ status = (*loaderLoadPlugin) (p, plugindir, name); - if (status) - return p; - diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch deleted file mode 100644 index 207816a3c518..000000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp ---- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200 -+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200 -@@ -3004,7 +3004,10 @@ - } - } - -- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR); -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ loadPluginFromXMLFile (context, xmlName, metadatadir); - free (xmlName); - } - -@@ -3031,7 +3034,10 @@ - free (homeplugins); - } - } -- loadPluginsFromXMLFiles (context, (char *)METADATADIR); -+ -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ loadPluginsFromXMLFiles (context, metadatadir); - - if (home && strlen (home)) - { -@@ -3043,7 +3049,10 @@ - free (homeplugins); - } - } -- loadPluginsFromName (context, (char *)PLUGINDIR); -+ -+ char *plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ loadPluginsFromName (context, plugindir); - } - - static void diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix deleted file mode 100644 index 8852ebd474ed..000000000000 --- a/pkgs/applications/window-managers/compiz/plugins-extra.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-extra-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1"; - }; - - patches = - [ # Support scaling wallpapers to the maximum size while still - # respecting the aspect ratio. - ./wallpaper-maxpect.patch - ]; - - NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz"; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Extra plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix deleted file mode 100644 index ea1c01e7414b..000000000000 --- a/pkgs/applications/window-managers/compiz/plugins-main.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-main-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36"; - }; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Main plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch deleted file mode 100644 index 8130dff1dba4..000000000000 --- a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in ---- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200 -+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200 -@@ -24,7 +24,7 @@ - <_long>Image position. - int - 0 -- 4 -+ 5 - - 0 - <_name>Scale and Crop -@@ -45,6 +45,10 @@ - 4 - <_name>Center Tiled - -+ -+ 5 -+ <_name>Centered Maxpect -+ - -