From e43bd7c4cea2d642ff06cd584cf8c6de20643dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 3 Jan 2012 19:12:06 +0000 Subject: [PATCH 01/13] Made lua and task warrior unstable crossbuild fine svn path=/nixpkgs/trunk/; revision=31251 --- pkgs/applications/misc/taskwarrior/unstable.nix | 9 ++++++++- pkgs/development/interpreters/lua-5/default.nix | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix index 057ebbe57c5..a50654b28d2 100644 --- a/pkgs/applications/misc/taskwarrior/unstable.nix +++ b/pkgs/applications/misc/taskwarrior/unstable.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ldl"; - buildInputs = [ cmake lua5 ]; + buildNativeInputs = [ cmake ]; + buildInputs = [ lua5 ]; + + crossAttrs = { + preConfigure = '' + export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl" + ''; + }; meta = { description = "Command-line todo list manager"; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 19a5599347f..06703e12210 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { -e "s/ ranlib/$crossConfig-ranlib/" \ src/Makefile ''; + dontStrip = true; }; meta = { From 195ff32a63a212fe222c91629eed8de71cd6255d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 3 Jan 2012 20:58:54 +0000 Subject: [PATCH 02/13] set emacs load-path according to NIX_PROFILES via site-start.el svn path=/nixpkgs/trunk/; revision=31252 --- pkgs/applications/editors/emacs-23/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 5de1b38bb41..312ced38c41 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -31,6 +31,16 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv ? glibc) [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + postInstall = '' + cat >$out/share/emacs/site-lisp/site-start.el < Date: Tue, 3 Jan 2012 20:58:57 +0000 Subject: [PATCH 03/13] load-path also for emacs-22 and emacs-snapshot svn path=/nixpkgs/trunk/; revision=31253 --- pkgs/applications/editors/emacs-22/default.nix | 10 ++++++++++ pkgs/applications/editors/emacs-snapshot/default.nix | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix index 89c8af070e0..c6b1fcaa987 100644 --- a/pkgs/applications/editors/emacs-22/default.nix +++ b/pkgs/applications/editors/emacs-22/default.nix @@ -30,6 +30,16 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk"; + postInstall = '' + cat >$out/share/emacs/site-lisp/site-start.el <$out/share/emacs/site-lisp/site-start.el < Date: Tue, 3 Jan 2012 20:59:00 +0000 Subject: [PATCH 04/13] added myself to maintainers svn path=/nixpkgs/trunk/; revision=31254 --- pkgs/applications/editors/emacs-23/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 312ced38c41..cc841a9bd12 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -66,7 +66,7 @@ EOF homepage = http://www.gnu.org/software/emacs/; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ]; platforms = stdenv.lib.platforms.all; }; } From d028c7e00d11497df9eed2228119f1cc20b6195d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 3 Jan 2012 21:14:14 +0000 Subject: [PATCH 05/13] Adding a preliminary package for librecad. It fails to install still. svn path=/nixpkgs/trunk/; revision=31255 --- pkgs/applications/misc/librecad/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/librecad/default.nix diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix new file mode 100644 index 00000000000..bcf0f1aee79 --- /dev/null +++ b/pkgs/applications/misc/librecad/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, qt4}: + +stdenv.mkDerivation { + name = "librecad-1.0.0"; + + src = fetchurl { + url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.0; + name = "librecad-1.0.0.tar.gz"; + sha256 = "0s1ikyvy98zz1vw3xf5la73n3sykib6292cmhh2z738ggwigicc9"; + }; + + patchPhase = '' + sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh + ''; + + configurePhase = "qmake PREFIX=$out"; + + # It builds, but it does not install + installPhase = "exit 1"; + + buildInputs = [ qt4 ]; + + meta = { + description = "A 2D CAD package based upon Qt"; + homepage = http://librecad.org; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08fa1d42d39..ceee0a7ce29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6990,6 +6990,8 @@ let inherit (gnome) libglade; }; + librecad = callPackage ../applications/misc/librecad { }; + lingot = callPackage ../applications/audio/lingot { inherit (gnome) libglade; }; From 35879729d21b5c74806cabb7842fd750076ac3a7 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Tue, 3 Jan 2012 22:02:34 +0000 Subject: [PATCH 06/13] Ralink firmware is no longer available directly from ralinktech.com, it is now available from git.kernel.org. I've used the debian svn repo here instead for convenience svn path=/nixpkgs/trunk/; revision=31256 --- .../linux/firmware/rt2860/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix index 70601f065ef..0c8accd2f6c 100644 --- a/pkgs/os-specific/linux/firmware/rt2860/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2860/default.nix @@ -1,14 +1,17 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchsvn }: -stdenv.mkDerivation rec { +# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git + +stdenv.mkDerivation { name = "rt2860-fw-26"; - src = fetchurl { - url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWTBNamsyTVRBNE1pNTZhWEE5UFQxU1ZESTROakJmUm1seWJYZGhjbVZmVmpJMkM%3D"; - name = "RT2860_Firmware_V26.zip"; - sha256 = "0kvjd8kfnmh8jj35jd10pnr1z7a00ks4c317dnnzgkd86mmcg4px"; + + src = fetchsvn { + url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink; + rev = 17279; + sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65"; }; - buildInputs = [ unzip ]; + unpackPhase = "true"; buildPhase = "true"; @@ -16,7 +19,11 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = '' + ensureDir $out + cp $src/rt2860.bin $out + cp $src/LICENSE $out/rt2860.LICENSE + ''; meta = { description = "Firmware for the Ralink RT2860 wireless cards"; From 30752215cd99f7985e742d553460c41680adf34f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 3 Jan 2012 22:25:38 +0000 Subject: [PATCH 07/13] linux_3_2_powertop svn path=/nixpkgs/trunk/; revision=31257 --- pkgs/top-level/all-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceee0a7ce29..6ec8211bb65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5702,6 +5702,25 @@ let #kernelPatches.mips_restart_2_6_36 ]; }; + + linux_3_2_powertop = linux_3_2.override { + extraConfig = '' + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + ''; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5849,6 +5868,7 @@ let linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2 pkgs.linuxPackages_3_2); + linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_2_powertop pkgs.linuxPackages_3_2_powertop); # The current default kernel / kernel modules. linux = linuxPackages.kernel; From 032617b0ab6eefd8be002a29ce3b55fb1dc1b5f2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Jan 2012 22:25:46 +0000 Subject: [PATCH 08/13] * Check whether any packages were generated. Apparently checkinstall doesn't return a non-zero exit code if something goes wrong. svn path=/nixpkgs/trunk/; revision=31258 --- pkgs/build-support/release/debian-build.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 52924d2c42c..aeeb050bfaa 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -68,6 +68,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( ensureDir $out/debs find . -name "*.deb" -exec cp {} $out/debs \; + [ "$(echo $out/debs/*.deb)" != "" ] + for i in $out/debs/*.deb; do header "Generated DEB package: $i" dpkg-deb --info "$i" From f3c3f115206bae31fdcdc6c787b3559a2d5520db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Jan 2012 22:33:48 +0000 Subject: [PATCH 09/13] * Debian requires/provides should be comma-separated. svn path=/nixpkgs/trunk/; revision=31259 --- pkgs/build-support/release/debian-build.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index aeeb050bfaa..070a54fc945 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -11,6 +11,8 @@ debRequires ? [] , ... } @ args: +with stdenv.lib; + vmTools.runInLinuxImage (stdenv.mkDerivation ( { @@ -61,8 +63,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( ${checkinstall}/sbin/checkinstall --nodoc -y -D \ --fstrans=${if fsTranslation then "yes" else "no"} \ - --requires="${toString debRequires}" \ - --provides="${toString debProvides}" \ + --requires="${concatStringsSep "," debRequires}" \ + --provides="${concatStringsSep "," debProvides}" \ make install ensureDir $out/debs From 0e1ea067abb9f20aaac4cbe6411d53f8e0fa29c0 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Wed, 4 Jan 2012 00:26:48 +0000 Subject: [PATCH 10/13] Cause ghostscript to build libgs. This fixes the failed build of libspectre. svn path=/nixpkgs/trunk/; revision=31260 --- pkgs/misc/ghostscript/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index ddd51f73f79..c29f7c4456f 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -89,7 +89,11 @@ stdenv.mkDerivation rec { doCheck = true; + preBuild = "make so"; + postInstall = '' + make soinstall + for i in $fonts; do (cd $out/share/ghostscript && tar xvfz $i) done From ec8e23cc9777a46a095314bb4c02a669db31f9b5 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Wed, 4 Jan 2012 05:48:38 +0000 Subject: [PATCH 11/13] In Emacs site-start.el check that NIX_PROFILES is set. In the stdenv this is not set, which causes an elisp error which in turn makes builds depending on Emacs (eg gnuplot) fail. svn path=/nixpkgs/trunk/; revision=31261 --- pkgs/applications/editors/emacs-22/default.nix | 8 ++++---- pkgs/applications/editors/emacs-23/default.nix | 8 ++++---- pkgs/applications/editors/emacs-snapshot/default.nix | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix index c6b1fcaa987..4a8369170ad 100644 --- a/pkgs/applications/editors/emacs-22/default.nix +++ b/pkgs/applications/editors/emacs-22/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el <$out/share/emacs/site-lisp/site-start.el <$out/share/emacs/site-lisp/site-start.el < Date: Wed, 4 Jan 2012 08:14:07 +0000 Subject: [PATCH 12/13] Updating mono. svn path=/nixpkgs/trunk/; revision=31262 --- pkgs/development/compilers/mono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index ee415e3b07b..471f0d5b36d 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}: stdenv.mkDerivation { - name = "mono-2.8"; + name = "mono-2.10.8.1"; src = fetchurl { - url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.8.tar.bz2; - sha256 = "04bivxg90mmihkp72sjshl4ijbjcbl9f6hdgm476zy794g5rwd78"; + url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz; + sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x"; }; buildInputs = [bison pkgconfig glib gettext perl]; From b3709689db6af30e4517f678ff3844a32c9382f4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 4 Jan 2012 09:05:22 +0000 Subject: [PATCH 13/13] Add modemmanager svn path=/nixpkgs/trunk/; revision=31263 --- pkgs/build-support/fetchurl/gnome.nix | 2 +- .../tools/networking/modemmanager/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/modemmanager/default.nix diff --git a/pkgs/build-support/fetchurl/gnome.nix b/pkgs/build-support/fetchurl/gnome.nix index 616c8203601..258b11d850e 100644 --- a/pkgs/build-support/fetchurl/gnome.nix +++ b/pkgs/build-support/fetchurl/gnome.nix @@ -1,6 +1,6 @@ { fetchurl }: -{ project, major, minor, patchlevel, extension ? "bz2", sha256 }: +{ project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }: let baseVersion = "${major}.${minor}"; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix new file mode 100644 index 00000000000..c5164d62770 --- /dev/null +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "ModemManager"; + major = "0"; minor = "5"; extension = "xz"; + sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7"; + }; + + buildNativeInputs = [ xz intltool pkgconfig ]; + + buildInputs = [ udev polkit dbus_glib ppp ]; + + configureFlags = "--with-polkit --with-udev-base-dir=$(out)/lib/udev"; + + meta = { + description = "WWAN modem manager, part of NetworkManager"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = [ stdenv.lib.platforms.linux ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ec8211bb65..bab49f41245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -988,6 +988,8 @@ let mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + modemmanager = callPackage ../tools/networking/modemmanager {}; + monit = builderDefsPackage ../tools/system/monit { inherit openssl flex bison; };