[Nix-commits] SVN commit: nix - r29055 - nixpkgs/trunk/pkgs/development/interpreters/ruby
Author: shlevy
Date: Tue Sep 6 05:37:59 2011
New Revision: 29055
URL: https://svn.nixos.org/websvn/nix/?rev=29055&sc=1
Log:
ruby/generated.nix: Add rails and its dependencies (which automatically updated
rake)
Modified:
nixpkgs/trunk/pkgs/development/interpreters/ruby/generated.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/ruby/generated.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/ruby/generated.nix Tue Sep
6 01:00:23 2011(r29054)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/generated.nix Tue Sep
6 05:37:59 2011(r29055)
@@ -3,11 +3,244 @@
g: # Get dependencies from patched gems
{
aliases = {
+actionmailer = g.actionmailer_3_1_0;
+actionpack = g.actionpack_3_1_0;
+activemodel = g.activemodel_3_1_0;
+activerecord = g.activerecord_3_1_0;
+activeresource = g.activeresource_3_1_0;
+activesupport = g.activesupport_3_1_0;
+arel = g.arel_2_2_1;
+bcrypt_ruby = g.bcrypt_ruby_3_0_0;
+builder = g.builder_3_0_0;
+bundler = g.bundler_1_0_18;
+erubis = g.erubis_2_7_0;
+hike = g.hike_1_2_1;
+i18n = g.i18n_0_6_0;
+mail = g.mail_2_3_0;
+mime_types = g.mime_types_1_16;
+multi_json = g.multi_json_1_0_3;
nix = g.nix_0_1_1;
-rake = g.rake_0_8_7;
+polyglot = g.polyglot_0_3_2;
+rack = g.rack_1_3_2;
+rack_cache = g.rack_cache_1_0_3;
+rack_mount = g.rack_mount_0_8_3;
+rack_ssl = g.rack_ssl_1_3_2;
+rack_test = g.rack_test_0_6_1;
+rails = g.rails_3_1_0;
+railties = g.railties_3_1_0;
+rake = g.rake_0_9_2;
+rdoc = g.rdoc_3_9_4;
+sprockets = g.sprockets_2_0_0;
+thor = g.thor_0_14_6;
+tilt = g.tilt_1_3_3;
+treetop = g.treetop_1_4_10;
+tzinfo = g.tzinfo_0_3_29;
};
- gem_nix_args = [ ''nix'' ''rake'' ];
+ gem_nix_args = [ ''nix'' ''rails'' ''rake'' ];
gems = {
+actionmailer_3_1_0 = {
+ basename = ''actionmailer'';
+ meta = {
+description = ''Email composition, delivery, and receiving framework
(part of Rails).'';
+homepage = ''http://www.rubyonrails.org'';
+longDescription = ''Email on Rails. Compose, deliver, receive, and
test emails using the familiar controller/view pattern. First-class support for
multipart email and attachments.'';
+ };
+ name = ''actionmailer-3.1.0'';
+ requiredGems = [ g.mail_2_3_0 ];
+ sha256 = ''1730ky434qhbqnwnvbj9r57i4s6lcmwvnfhv6i91iif7anmjl22p'';
+};
+actionpack_3_1_0 = {
+ basename = ''actionpack'';
+ meta = {
+description = ''Web-flow and rendering framework putting the VC in MVC
(part of Rails).'';
+homepage = ''http://www.rubyonrails.org'';
+longDescription = ''Web apps on Rails. Simple, battle-tested
conventions for building and testing MVC web applications. Works with any
Rack-compatible server.'';
+ };
+ name = ''actionpack-3.1.0'';
+ requiredGems = [ g.activemodel_3_1_0 g.rack_cache_1_0_3
g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_0 g.erubis_2_7_0 ];
+ sha256 = ''0igy1dp8zdh653v4wz7vxdjmz681k8653n0xan9ng1qgsk9b7wlh'';
+};
+activemodel_3_1_0 = {
+ basename = ''activemodel'';
+ meta = {
+description = ''A toolkit for building modeling frameworks (part of
Rails).'';
+homepage = ''http://www.rubyonrails.org'';
+longDescription = ''A toolkit for building modeling frameworks like
Active Record and Active Resource. Rich support for attributes, callbacks,
validations, observers, serialization, internationalization, and testing.'';
+ };
+ name = ''activemodel-3.1.0'';
+ requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 g.bcrypt_ruby_3_0_0 ];
+ sha256 = ''1h54v05ci4l7nx79i9lcnf6z00lhi5wpn8sgyr5869xihvq6'';
+};
+activerecord_3_1_0 = {
+ basename = ''activerecord'';
+ meta = {
+description = ''Object-relational mapper framework (part of Rails).'';
+homepage = ''http://www.rubyonrails.org'';
+longDescription = ''Databases on Rails. Build a persistent domain
model by mapping database tables to Ruby classes. Strong conventions for
associations, validations, aggregations, migrations, and testing come
baked-in.'';
+ };
+ name = ''activerecord-3.1.0'';
+ requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_29 ];
+ sha256 = ''1dq5k2r6a85wmzgv5gv0rrxf43agzzcj6z4az6w034nxarv7ccml'';
+};
+activeresource_3_1_0 = {
+ basename = ''activeresource'';
+ meta = {
+description = ''REST modeling framework (part of Rails).'';
+homepage = ''http://www.rubyonrails.org'';
+longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby
classes and work with them like Active Record models.'';
+ };
+ name = ''activeresource-3.1.0'';
+ requiredGems = [ ];
+ sha256 = ''1vd4mmfxk1zmqxv44q0wxhg74yc7qah17im44qjv0b850522vavg'';
+};
+
[Nix-commits] SVN commit: nix - r29054 - in nixpkgs/trunk/pkgs/desktops/xfce-4.8: . support
Author: eelco
Date: Tue Sep 6 01:00:23 2011
New Revision: 29054
URL: https://svn.nixos.org/websvn/nix/?rev=29054&sc=1
Log:
* Add libgdu as a dependency to gvfs to enable mounting of volumes
(through udisks) in Xfce. Libgdu is part of gnome-disk-utility,
which would pull in lots of Gnome dependencies, so some hackery is
necessary to build only the useful part.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu-only.patch
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixMon Sep 5 23:33:29
2011(r29053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixTue Sep 6 01:00:23
2011(r29054)
@@ -5,7 +5,7 @@
SUPPORT
- #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { };
+ libgdu = callPackage ./support/libgdu.nix { };
# Gvfs is required by Thunar for the trash feature and for volume
# mounting. Should use the one from Gnome, but I don't want to mess
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
23:33:29 2011(r29053)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Tue Sep 6
01:00:23 2011(r29054)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }:
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }:
stdenv.mkDerivation rec {
name = "gvfs-1.8.2";
@@ -8,7 +8,7 @@
sha256 =
"0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
};
- buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
+ buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ];
meta = {
description = "Virtual Filesystem support library (for Xfce)";
Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu-only.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/libgdu-only.patch Tue Sep
6 01:00:23 2011(r29054)
@@ -0,0 +1,144 @@
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac
gnome-disk-utility-2.30.1/configure.ac
+--- gnome-disk-utility-2.30.1-orig/configure.ac2010-03-22
16:54:09.0 +0100
gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.0
+0200
+@@ -106,17 +106,6 @@
+ # GNOME
+ # *
+
+-GNOME_COMMON_INIT
+-GNOME_DOC_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc],
+- [use gtk-doc to build documentation [default=yes]]),,
+- enable_gtk_doc=yes)
+-GTK_DOC_CHECK([1.3])
+-
+ # ***
+ # Check for required packages
+ # ***
+@@ -130,7 +119,6 @@
+ UNIQUE_REQUIRED=1.0
+ LIBNOTIFY_REQUIRED=0.3.0
+ NAUTILUS_REQUIRED=2.24.0
+-AVAHI_UI_REQUIRED=0.6.25
+
+ UDISKS_REQUIRED=1.0.0
+ UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
+@@ -144,13 +132,7 @@
+ PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
+ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
+ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
+-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED])
+-PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED])
+-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
+ PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks <
$UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
+-PKG_CHECK_MODULES(X11, [x11])
+-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED])
+
+ # *
+ # Remote Access
+@@ -183,21 +165,10 @@
+ AC_SUBST(GNOME_KEYRING_CFLAGS)
+ AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
+
+-# *
+-# Documentation
+-# *
+-
+-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the
scrollkeeper package)
+-fi
+-
+ #
+ # Internationalization
+ #
+
+-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
+-
+ GETTEXT_PACKAGE=gnome-disk-utility
+ AC_SUBST([GETTEXT_PACKAGE])
+ AM_GLIB_GNU_GETTEXT
+diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am
gnome-disk-utility-2.30.1/doc/Makefile.am
+--- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02
20:52:38.0 +0100
gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.0
[Nix-commits] SVN commit: nix - r29053 - nixos/trunk/modules/services/misc
Author: eelco
Date: Mon Sep 5 23:33:29 2011
New Revision: 29053
URL: https://svn.nixos.org/websvn/nix/?rev=29053&sc=1
Log:
Modified:
nixos/trunk/modules/services/misc/autofs.nix
Modified: nixos/trunk/modules/services/misc/autofs.nix
==
--- nixos/trunk/modules/services/misc/autofs.nixMon Sep 5 23:31:04
2011(r29052)
+++ nixos/trunk/modules/services/misc/autofs.nixMon Sep 5 23:33:29
2011(r29053)
@@ -29,7 +29,7 @@
};
autoMaster = mkOption {
-example = ''
+example = literalExample ''
autoMaster = let
mapConf = pkgs.writeText "auto" '''
kernel-ro,soft,intr ftp.kernel.org:/pub/linux
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29052 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/support
Author: eelco Date: Mon Sep 5 23:31:04 2011 New Revision: 29052 URL: https://svn.nixos.org/websvn/nix/?rev=29052&sc=1 Log: * Urgh. Should test first. Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix == --- nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5 23:30:42 2011(r29051) +++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5 23:31:04 2011(r29052) @@ -14,5 +14,5 @@ description = "Virtual Filesystem support library (for Xfce)"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; - } + }; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29051 - nixpkgs/trunk/pkgs/desktops/xfce-4.8/support
Author: eelco
Date: Mon Sep 5 23:30:42 2011
New Revision: 29051
URL: https://svn.nixos.org/websvn/nix/?rev=29051&sc=1
Log:
* Oops.
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
23:30:26 2011(r29050)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
23:30:42 2011(r29051)
@@ -11,7 +11,7 @@
buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
meta = {
-description = "Virtual Filesystem support library (for Xfce)"
+description = "Virtual Filesystem support library (for Xfce)";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29050 - in nixpkgs/trunk/pkgs/desktops/xfce-4.8: applications art core support
Author: eelco
Date: Mon Sep 5 23:30:26 2011
New Revision: 29050
URL: https://svn.nixos.org/websvn/nix/?rev=29050&sc=1
Log:
* Add Xfce 4.8 to the channel.
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/xfwm4.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/mousepad.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -14,5 +14,7 @@
homepage = http://www.xfce.org/projects/mousepad/;
description = "A simple text editor for Xfce";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/ristretto.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -20,5 +20,7 @@
homepage = http://goodies.xfce.org/projects/applications/ristretto;
description = "A fast and lightweight picture-viewer for the Xfce desktop
environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/terminal.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -19,5 +19,7 @@
homepage = http://www.xfce.org/projects/terminal;
description = "A modern terminal emulator primarily for the Xfce desktop
environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -34,5 +34,7 @@
homepage = http://www.xfce.org/projects/xfce4-mixer;
description = "A volume control application for the Xfce desktop
environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
Mon Sep 5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
Mon Sep 5 23:30:26 2011(r29050)
@@ -18,5 +18,7 @@
homepage =
http://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";
license = "GPLv2+";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix Mon Sep
5 23:26:06 2011(r29049)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix Mon Sep
5 23:30:26 2011(r29050)
@@ -13,5 +13,7 @@
meta = {
[Nix-commits] SVN commit: nix - r29049 - nixpkgs/trunk/pkgs/development/libraries/strigi
Author: eelco Date: Mon Sep 5 23:26:06 2011 New Revision: 29049 URL: https://svn.nixos.org/websvn/nix/?rev=29049&sc=1 Log: * Layout. Modified: nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Mon Sep 5 21:02:21 2011(r29048) +++ nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Mon Sep 5 23:26:06 2011(r29049) @@ -11,7 +11,7 @@ sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi"; }; - includeAllQtDirs=true; + includeAllQtDirs = true; CLUCENE_HOME = clucene_core; ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: Re: binutils-2.20.1a replaced by 2.20.1 and so 2.21.1a?
On 01/-10/-28163 02:59 PM, Tristan Gingold wrote: On Aug 30, 2011, at 11:46 AM, Steffen Dettmer wrote: Hi, I missed the information why 2.21.1a replaced 2.21.1. I read it only includes some more files. Where they simply forgotten and re-added? I think I have almost no issue, because I could simply rename 2.21.1a to 2.21.1 (some build scripts assume that the version from tarball equals the directory name included), correct? Hi, I was about to write a message to this mailing list once the process was completed but it isn't yet. This was a license issue raised by the FSF: some files were derived from cgen files, but these cgen files weren't included in the tarballs. We were asked by the FSF to repackage all the incomplete tarballs. Hello, The servers for the NixOS Linux distribution host a copy of one of the removed tarballs (http://nixos.org/tarballs/binutils-2.21.tar.bz2). Does this packaging error put NixOS in inadvertent violation of the GPL? Cheers, Shea Levy As this is a tedious task (and many thanks to Nick Clifton for creating the new tarballs), we only repackage the last minor version of each major release (ie 2.21.1a replaces all 2.21.xx releases and so on). Currently only 2.20.1a and 2.21.1a are published. There is a technical issue with uploading the old one (that should be addressed soon). ps: BTW, removing 2.21.1 from http://ftp.gnu.org/gnu/binutils/ breaks easy reproducibility of build instructions; I really like that here even versions from 1996 are kept. Cool URIs don't change (http://www.w3.org/Provider/Style/URI) :-) Sorry for that. Tristan. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Re: Current stdenv is Broken in Absence of Substitutors
On 09/05/2011 06:11 PM, Ludovic Courtès wrote: Hi, Shea Levy skribis: Due to a license issue, the GNU mirrors no longer contain binutils-2.21.tar.bz2 (http://sourceware.org/ml/binutils/2011-08/msg00198.html). Recent Emacs releases had a similar problem: https://lists.gnu.org/archive/html/emacs-devel/2011-07/msg01155.html Ludo’. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev According to my reading of the two threads, nixos.org can be considered in violation of the GPL by hosting the binutils sources on its servers. Is that understanding correct? ~Shea ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Re: Current stdenv is Broken in Absence of Substitutors
Hi, Shea Levy skribis: > Due to a license issue, the GNU mirrors no longer contain > binutils-2.21.tar.bz2 > (http://sourceware.org/ml/binutils/2011-08/msg00198.html). Recent Emacs releases had a similar problem: https://lists.gnu.org/archive/html/emacs-devel/2011-07/msg01155.html Ludo’. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29048 - in nixpkgs/trunk/pkgs: desktops/kde-4.7 desktops/kde-4.7/kdebase desktops/kde-4.7/support/soprano servers/sql/virtuoso
Author: eelco
Date: Mon Sep 5 21:02:21 2011
New Revision: 29048
URL: https://svn.nixos.org/websvn/nix/?rev=29048&sc=1
Log:
* Style fixes.
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix Mon Sep 5
20:54:53 2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix Mon Sep 5
21:02:21 2011(r29048)
@@ -1,5 +1,5 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica,
- libcanberra, virtuoso, makeWrapper, samba
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+, libcanberra, virtuoso, makeWrapper, samba
}:
# TODO: Re-enable ntrack once it is fixed upstream
@@ -10,12 +10,6 @@
makeWrapper samba (libcanberra.override { gtk = null; })
];
-# Copied from kde45, Nepomuk needs it.
- postInstall = ''
-wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH :
"${virtuoso}/lib" \
---prefix PATH : "${virtuoso}/bin"
- '';
-
meta = {
license = "LGPL";
};
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix Mon Sep 5 20:54:53
2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepim.nix Mon Sep 5 21:02:21
2011(r29048)
@@ -3,8 +3,10 @@
kde {
- buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-libxslt cyrus_sasl gpgme libassuan grantlee ];
+ buildInputs =
+[ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
+ libxslt cyrus_sasl gpgme libassuan grantlee
+];
passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix Mon Sep 5 20:54:53
2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdepimlibs.nix Mon Sep 5 21:02:21
2011(r29048)
@@ -2,8 +2,10 @@
, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
kde {
- buildInputs = [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-openldap cyrus_sasl akonadi prison ];
+ buildInputs =
+[ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
+ openldap cyrus_sasl akonadi prison
+];
propagatedBuildInputs = [ kdelibs ];
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Mon Sep
5 20:54:53 2011(r29047)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/support/soprano/default.nix Mon Sep
5 21:02:21 2011(r29048)
@@ -8,11 +8,13 @@
sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
};
- patches = [ (fetchurl {
-url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-name = "soprano-virtuoso-restart.patch";
-sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
- })];
+ patches =
+[ (fetchurl {
+url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
+name = "soprano-virtuoso-restart.patch";
+sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
+ })
+];
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];
Modified: nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix
==
--- nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix Mon Sep 5 20:54:53
2011(r29047)
+++ nixpkgs/trunk/pkgs/servers/sql/virtuoso/default.nix Mon Sep 5 21:02:21
2011(r29048)
@@ -4,15 +4,15 @@
name = "virtuoso-opensource-6.1.3";
src = fetchurl {
-url = "mirror://sf/virtuoso/${name}.tar.gz";
+url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2";
};
buildInputs = [ libxml2 openssl readline gawk ];
- CPP="${stdenv.gcc}/bin/gcc -E";
+ CPP = "${stdenv.gcc}/bin/gcc -E";
- configureFlags="
+ configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline}
--disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl}
__
Re: [Nix-dev] Current stdenv is Broken in Absence of Substitutors
Hi, On 09/05/2011 09:27 PM, Shea Levy wrote: Due to a license issue, the GNU mirrors no longer contain binutils-2.21.tar.bz2 (http://sourceware.org/ml/binutils/2011-08/msg00198.html). Therefore, building stdenv fails in a non-standard nix store location or if substitutors are not used. I can think of two ways to fix this: Upload the tarball somewhere and update the expression in trunk Done. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29047 - nixpkgs/trunk/pkgs/development/tools/misc/binutils
Author: eelco
Date: Mon Sep 5 20:54:53 2011
New Revision: 29047
URL: https://svn.nixos.org/websvn/nix/?rev=29047&sc=1
Log:
* Fix the binutils URL.
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Mon Sep
5 20:50:15 2011(r29046)
+++ nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Mon Sep
5 20:54:53 2011(r29047)
@@ -7,7 +7,7 @@
name = basename + stdenv.lib.optionalString (cross != null)
"-${cross.config}";
src = fetchurl {
-url = "mirror://gnu/binutils/${basename}.tar.bz2";
+url = "http://nixos.org/tarballs/${basename}.tar.bz2";;
sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0";
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29046 - nixos/trunk/modules/services/x11/desktop-managers
Author: eelco
Date: Mon Sep 5 20:50:15 2011
New Revision: 29046
URL: https://svn.nixos.org/websvn/nix/?rev=29046&sc=1
Log:
* Xfce 4.6 fix.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:49:41 2011(r29045)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:50:15 2011(r29046)
@@ -82,7 +82,7 @@
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime"
"/share/desktop-directories" ];
-environment.shellInit =
+environment.shellInit = optionalString isXfce48
''
export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
'';
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29045 - nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix
Author: simons
Date: Mon Sep 5 20:49:41 2011
New Revision: 29045
URL: https://svn.nixos.org/websvn/nix/?rev=29045&sc=1
Log:
haskell-cabal2nix: updated to version 1.14
Modified:
nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Mon Sep
5 20:37:06 2011(r29044)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Mon Sep
5 20:49:41 2011(r29045)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
- version = "1.13";
- sha256 = "1wjxaz3yyc41y4plwixd6p2g7higvjzpi8znbgvnzcpfj3hlh616";
+ version = "1.14";
+ sha256 = "0sdim1yqxx2wplfz6skz78y5lmh6dknc1k7jszmjnq0n9yc0b4bf";
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29044 - nixos/trunk/modules/services/x11/desktop-managers
Author: eelco
Date: Mon Sep 5 20:37:06 2011
New Revision: 29044
URL: https://svn.nixos.org/websvn/nix/?rev=29044&sc=1
Log:
* Enable gvfs in Xfce.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:36:37 2011(r29043)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Sep 5
20:37:06 2011(r29044)
@@ -74,11 +74,18 @@
++ optionals isXfce48 [
pkgs.xfce.libxfce4ui
pkgs.xfce.garcon
+pkgs.xfce.thunar_volman
+pkgs.xfce.gvfs
]
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime"
"/share/desktop-directories" ];
+
+environment.shellInit =
+ ''
+export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
+ '';
# Enable helpful DBus services.
services.hal = mkIf (!isXfce48) { enable = true; };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29043 - in nixpkgs/trunk/pkgs/desktops/xfce-4.8: . core support
Author: eelco
Date: Mon Sep 5 20:36:37 2011
New Revision: 29043
URL: https://svn.nixos.org/websvn/nix/?rev=29043&sc=1
Log:
* Add thunar-volman and gvfs.
Added:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/
nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
Modified:
nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/core/thunar-volman.nix Mon Sep 5
20:36:37 2011(r29043)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, xfconf, udev, libnotify }:
+
+stdenv.mkDerivation rec {
+ name = "thunar-volman-0.6.0";
+
+ src = fetchurl {
+url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2";;
+sha1 = "dcda936948623b342b290a78c294f71c038e832e";
+ };
+
+ buildInputs =
+[ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
+ xfconf libnotify
+];
+
+ enableParallelBuilding = true;
+
+ meta = {
+homepage = http://thunar.xfce.org/;
+description = "Thunar extension for automatic management of removable
drives and media";
+license = "GPLv2+";
+ };
+}
Modified: nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixMon Sep 5 19:45:49
2011(r29042)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/default.nixMon Sep 5 20:36:37
2011(r29043)
@@ -3,6 +3,16 @@
rec {
inherit (pkgs.gtkLibs) gtk glib;
+ SUPPORT
+
+ #gnome_disk_utility = callPackage ./support/gnome-disk-utility.nix { };
+
+ # Gvfs is required by Thunar for the trash feature and for volume
+ # mounting. Should use the one from Gnome, but I don't want to mess
+ # with the Gnome packages (or pull in a zillion Gnome dependencies).
+ gvfs = callPackage ./support/gvfs.nix { };
+
+
CORE
libxfce4util = callPackage ./core/libxfce4util.nix { };
@@ -43,10 +53,13 @@
thunar = callPackage ./core/thunar.nix { };
+ thunar_volman = callPackage ./core/thunar-volman.nix { };
+
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
# !!! Add xfce4-appfinder
+
APPLICATIONS
terminal = callPackage ./applications/terminal.nix {
@@ -61,6 +74,7 @@
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
+
ART
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
Added: nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/xfce-4.8/support/gvfs.nix Mon Sep 5
20:36:37 2011(r29043)
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev }:
+
+stdenv.mkDerivation rec {
+ name = "gvfs-1.8.2";
+
+ src = fetchurl {
+url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2";
+sha256 =
"0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
+ };
+
+ buildInputs = [ pkgconfig glib dbus.libs intltool udev ];
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29042 - in nixpkgs/trunk/pkgs: development/libraries/haskell/GLURaw top-level
Author: simons
Date: Mon Sep 5 19:45:49 2011
New Revision: 29042
URL: https://svn.nixos.org/websvn/nix/?rev=29042&sc=1
Log:
haskell-packages.nix: removed more obsolete manual overrides
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLURaw/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLURaw/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLURaw/default.nix Mon Sep
5 19:45:45 2011(r29041)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLURaw/default.nix Mon Sep
5 19:45:49 2011(r29042)
@@ -1,11 +1,11 @@
-{ cabal, GLU, OpenGLRaw }:
+{ cabal, freeglut, OpenGLRaw }:
cabal.mkDerivation (self: {
pname = "GLURaw";
version = "1.1.0.0";
sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac";
buildDepends = [ OpenGLRaw ];
- extraLibraries = [ GLU ];
+ extraLibraries = [ freeglut ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A raw binding for the OpenGL graphics system";
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:45:45
2011(r29041)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:45:49
2011(r29042)
@@ -478,9 +478,7 @@
cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
- criterion = callPackage ../development/libraries/haskell/criterion {
-parsec = self.parsec3;
- };
+ criterion = callPackage ../development/libraries/haskell/criterion {};
Crypto = callPackage ../development/libraries/haskell/Crypto {};
@@ -574,9 +572,7 @@
ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
- ghcEvents = callPackage ../development/libraries/haskell/ghc-events {
-mtl = self.mtl1;
- };
+ ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
@@ -599,9 +595,7 @@
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
- GLURaw = callPackage ../development/libraries/haskell/GLURaw {
-GLU = pkgs.freeglut;
- };
+ GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix
{};
GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix
{};
@@ -645,9 +639,7 @@
haskeline = callPackage ../development/libraries/haskell/haskeline {};
- haskelineClass = callPackage
../development/libraries/haskell/haskeline-class {
-mtl = self.mtl1;
- };
+ haskelineClass = callPackage
../development/libraries/haskell/haskeline-class {};
haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {};
@@ -1263,15 +1255,12 @@
zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix
{
inherit (pkgs) zlib;
};
-
zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix
{
inherit (pkgs) zlib;
};
-
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix
{
inherit (pkgs) zlib;
};
-
zlib = self.zlib_0_5_0_0;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29041 - in nixpkgs/trunk/pkgs: development/libraries/haskell/WebBits top-level
Author: simons
Date: Mon Sep 5 19:45:45 2011
New Revision: 29041
URL: https://svn.nixos.org/websvn/nix/?rev=29041&sc=1
Log:
haskell-WebBits: renamed nix file for consistency
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.0.nix
- copied, changed from r29040,
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.0.nix (from r29040,
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/default.nix)
==
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:31:49
2011(r29040)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:45:45
2011(r29041)
@@ -1194,13 +1194,13 @@
warp = callPackage ../development/libraries/haskell/warp {};
- WebBits = callPackage ../development/libraries/haskell/WebBits {
+ WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
parsec = self.parsec2;
};
-
- WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
+ WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
parsec = self.parsec2;
};
+ WebBits = self.WebBits_2_0;
WebBitsHtml = callPackage ../development/libraries/haskell/WebBits-Html {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Current stdenv is Broken in Absence of Substitutors
On Mon, Sep 05, 2011 at 03:27:22PM -0400, Shea Levy wrote: > Hi all, > > Due to a license issue, the GNU mirrors no longer contain > binutils-2.21.tar.bz2 > (http://sourceware.org/ml/binutils/2011-08/msg00198.html). > Therefore, building stdenv fails in a non-standard nix store > location or if substitutors are not used. I can think of two ways to > fix this: Upload the tarball somewhere and update the expression in > trunk, or start the process of merging stdenv-updates (which has > already updated to 2.21.1a) into trunk. I'd prefer the latter, > especially since hosting binutils-2.21.tar.bz2 may violate licenses > subtly. Thoughts? Niksnut wondered, why the content-addressed mirror did not work. Any idea why? Maybe that mirror balances the storage in favour of those most requested? (stdenv pieces having more chances to fall of the mirror) Regards, Lluís ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29040 - in nixpkgs/trunk/pkgs: development/libraries/haskell/ghc-paths top-level
Author: simons
Date: Mon Sep 5 19:31:49 2011
New Revision: 29040
URL: https://svn.nixos.org/websvn/nix/?rev=29040&sc=1
Log:
haskell-ghc-paths: updated default version to 0.1.0.8 (and dropped obsolete
older versions)
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/default.nix
- copied, changed from r29039,
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/default.nix (from
r29039, nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix)
==
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:31:42
2011(r29039)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:31:49
2011(r29040)
@@ -580,10 +580,7 @@
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
- ghcPaths_0_1_0_5 = callPackage
../development/libraries/haskell/ghc-paths/0.1.0.5.nix {};
- ghcPaths_0_1_0_6 = callPackage
../development/libraries/haskell/ghc-paths/0.1.0.6.nix {};
- ghcPaths_0_1_0_8 = callPackage
../development/libraries/haskell/ghc-paths/0.1.0.8.nix {};
- ghcPaths = self.ghcPaths_0_1_0_6; # version 0.1.0.5 doesn't build with an
up-to-date GHC
+ ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
@@ -1171,9 +1168,7 @@
uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {};
- vacuum = callPackage ../development/libraries/haskell/vacuum {
-ghcPaths = self.ghcPaths_0_1_0_6;
- };
+ vacuum = callPackage ../development/libraries/haskell/vacuum {};
vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};
@@ -1323,12 +1318,8 @@
frown = callPackage ../development/tools/parsing/frown {};
haddock_2_4_2 = callPackage
../development/tools/documentation/haddock/2.4.2.nix {};
- haddock_2_7_2 = callPackage
../development/tools/documentation/haddock/2.7.2.nix {
-ghcPaths = self.ghcPaths_0_1_0_6;
- };
- haddock_2_9_2 = callPackage
../development/tools/documentation/haddock/2.9.2.nix {
-ghcPaths = self.ghcPaths_0_1_0_6;
- };
+ haddock_2_7_2 = callPackage
../development/tools/documentation/haddock/2.7.2.nix {};
+ haddock_2_9_2 = callPackage
../development/tools/documentation/haddock/2.9.2.nix {};
haddock = self.haddock_2_7_2;
happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29039 - nixpkgs/trunk/pkgs/development/tools/parsing/happy
Author: simons
Date: Mon Sep 5 19:31:42 2011
New Revision: 29039
URL: https://svn.nixos.org/websvn/nix/?rev=29039&sc=1
Log:
haskell-happy: fixed build of version 1.18.4
Modified:
nixpkgs/trunk/pkgs/development/tools/parsing/happy/1.18.4.nix
Modified: nixpkgs/trunk/pkgs/development/tools/parsing/happy/1.18.4.nix
==
--- nixpkgs/trunk/pkgs/development/tools/parsing/happy/1.18.4.nix Mon Sep
5 19:24:12 2011(r29038)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/happy/1.18.4.nix Mon Sep
5 19:31:42 2011(r29039)
@@ -1,4 +1,4 @@
-{ cabal, mtl }:
+{ cabal, mtl, perl }:
cabal.mkDerivation (self: {
pname = "happy";
@@ -7,6 +7,7 @@
isLibrary = false;
isExecutable = true;
buildDepends = [ mtl ];
+ buildTools = [ perl ];
meta = {
homepage = "http://www.haskell.org/happy/";;
description = "Happy is a parser generator for Haskell";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Current stdenv is Broken in Absence of Substitutors
Hi all, Due to a license issue, the GNU mirrors no longer contain binutils-2.21.tar.bz2 (http://sourceware.org/ml/binutils/2011-08/msg00198.html). Therefore, building stdenv fails in a non-standard nix store location or if substitutors are not used. I can think of two ways to fix this: Upload the tarball somewhere and update the expression in trunk, or start the process of merging stdenv-updates (which has already updated to 2.21.1a) into trunk. I'd prefer the latter, especially since hosting binutils-2.21.tar.bz2 may violate licenses subtly. Thoughts? Cheers, Shea ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29038 - in nixpkgs/trunk/pkgs: development/libraries/haskell/GLUT development/libraries/haskell/OpenGLRaw development/libraries/haskell/hp2any-graph top-level
Author: simons
Date: Mon Sep 5 19:24:12 2011
New Revision: 29038
URL: https://svn.nixos.org/websvn/nix/?rev=29038&sc=1
Log:
haskell-packages.nix: removed lots of explicit argument assignments that have
become obsolete
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-graph/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix Mon Sep
5 19:24:07 2011(r29037)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix Mon Sep
5 19:24:12 2011(r29038)
@@ -1,11 +1,11 @@
-{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.1.2";
sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
buildDepends = [ OpenGL ];
- extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL Utility Toolkit";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Mon Sep
5 19:24:07 2011(r29037)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Mon Sep
5 19:24:12 2011(r29038)
@@ -1,11 +1,11 @@
-{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.2.1";
sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
buildDepends = [ OpenGL ];
- extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL Utility Toolkit";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix Mon Sep
5 19:24:07 2011(r29037)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix Mon Sep
5 19:24:12 2011(r29038)
@@ -1,5 +1,5 @@
-{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL, StateVar
-, Tensor
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
+, StateVar, Tensor
}:
cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@
version = "2.2.2.0";
sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
buildDepends = [ OpenGL StateVar Tensor ];
- extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL Utility Toolkit";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
Mon Sep 5 19:24:07 2011(r29037)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
Mon Sep 5 19:24:12 2011(r29038)
@@ -1,10 +1,10 @@
-{ cabal, GL }:
+{ cabal, mesa }:
cabal.mkDerivation (self: {
pname = "OpenGLRaw";
version = "1.1.0.1";
sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf";
- extraLibraries = [ GL ];
+ extraLibraries = [ mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A raw binding for the OpenGL graphics system";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-graph/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-graph/default.nix
Mon Sep 5 19:24:07 2011(r29037)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hp2any-graph/default.nix
Mon Sep 5 19:24:12 2011(r29038)
@@ -1,4 +1,4 @@
-{ cabal, GLUT, glut, hp2anyCore, network, OpenGL, parseargs }:
+{ cabal, freeglut, GLUT, hp2anyCore, network, OpenGL, parseargs }:
cabal.mkDerivation (self: {
pname = "hp2any-graph";
@@ -7,7 +7,7 @@
isL
[Nix-commits] SVN commit: nix - r29037 - nixpkgs/trunk/pkgs/development/compilers/ehc
Author: simons
Date: Mon Sep 5 19:24:07 2011
New Revision: 29037
URL: https://svn.nixos.org/websvn/nix/?rev=29037&sc=1
Log:
haskell-ehc: updated to revision 2293
Modified:
nixpkgs/trunk/pkgs/development/compilers/ehc/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ehc/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/ehc/default.nixMon Sep 5
19:24:01 2011(r29036)
+++ nixpkgs/trunk/pkgs/development/compilers/ehc/default.nixMon Sep 5
19:24:07 2011(r29037)
@@ -1,25 +1,23 @@
-{stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib, uuagc, mtl,
network, binary, llvm, fgl}:
-
-stdenv.mkDerivation (rec {
- revision = "1996";
+{ stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib
+, uuagc, mtl, network, binary, llvm, fgl, syb
+}:
+
+let
+ revision = "2293";
+in
+stdenv.mkDerivation {
name = "ehc-svn-${revision}";
- homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome/";;
src = fetchsvn {
- url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
- rev = revision;
- sha256 =
"92c658cd15dd513ccaeb81341f2680056276a46d053330f66c0214d10a6729e2";
+ url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
+ rev = revision;
+ sha256 =
"f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6";
};
- propagatedBuildInputs = [mtl network binary fgl];
+ propagatedBuildInputs = [mtl network binary fgl syb];
buildInputs = [coreutils m4 ghc libtool uulib uuagc];
- # --force is required because the dependencies are not properly
- # detected by Nix, being located in several package config files
- configureFlags = [
-"--with-cabal-config-options=--ghc-pkg-options=--force"
-"--with-cpp-ehc-options=-I${glibc}/include"
- ];
+ configureFlags = "--with-cpp-ehc-options=-I${glibc}/include";
# EHC builds packages during compilation; these are by default
# installed in the user-specific package config file. We do not
@@ -34,8 +32,12 @@
'';
meta = {
+homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome";;
description = "Essential Haskell Compiler";
+platforms = stdenv.lib.platforms.linux;
+maintainers = [
+ stdenv.lib.maintainers.andres
+ stdenv.lib.maintainers.simons
+];
};
-
- inherit coreutils;
-})
+}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29036 - in nixpkgs/trunk/pkgs: development/libraries/haskell/X11 top-level
Author: simons
Date: Mon Sep 5 19:24:01 2011
New Revision: 29036
URL: https://svn.nixos.org/websvn/nix/?rev=29036&sc=1
Log:
haskell-X11: updated build expression
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nixMon Sep
5 19:23:06 2011(r29035)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nixMon Sep
5 19:24:01 2011(r29036)
@@ -1,12 +1,11 @@
-{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ?
null}:
+{ cabal, libX11, libXext, libXinerama, syb }:
-assert xineramaSupport -> (libXinerama != null && libXext != null);
-
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "X11";
version = "1.5.0.0";
sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
- propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then
[libXinerama libXext] else []);
+ buildDepends = [ syb ];
+ extraLibraries = [ libX11 libXext libXinerama ];
meta = {
homepage = "http://code.haskell.org/X11";;
description = "A binding to the X11 graphics library";
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:23:06
2011(r29035)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:24:01
2011(r29036)
@@ -1283,10 +1283,7 @@
wxdirect = callPackage
../development/libraries/haskell/wxHaskell/wxdirect.nix {};
- X11 = callPackage ../development/libraries/haskell/X11 {
-inherit (pkgs.xlibs) libX11 libXinerama libXext;
-xineramaSupport = true;
- };
+ X11 = callPackage ../development/libraries/haskell/X11 {};
X11Xft = callPackage ../development/libraries/haskell/X11-xft {
inherit (pkgs) pkgconfig freetype fontconfig;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29035 - nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package
Author: eelco
Date: Mon Sep 5 19:23:06 2011
New Revision: 29035
URL: https://svn.nixos.org/websvn/nix/?rev=29035&sc=1
Log:
* Turn parallel building support on again (got lost somewhere...).
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Mon Sep 5
18:25:59 2011(r29034)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Mon Sep 5
19:23:06 2011(r29035)
@@ -27,10 +27,11 @@
# released as individual tarballs
kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
stdenv.mkDerivation ({
-name = "${name}-${release}";
-src = kdesrc name;
-meta = defMeta // meta;
- } // (removeAttrs a [ "meta" "name" ]));
+ name = "${name}-${release}";
+ src = kdesrc name;
+ meta = defMeta // meta;
+ enableParallelBuilding = true;
+} // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
@@ -43,9 +44,13 @@
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module;
- cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
- "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
+ cmakeFlags =
+[ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+ "-DBUILD_doc=TRUE"
+ "-DBUILD_${subdir}=TRUE"
+] ++ cmakeFlags;
meta = defMeta // meta;
+ enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29034 - nixpkgs/trunk/pkgs/applications/window-managers/xmonad
Author: simons
Date: Mon Sep 5 18:25:59 2011
New Revision: 29034
URL: https://svn.nixos.org/websvn/nix/?rev=29034&sc=1
Log:
haskell-xmonad-extras: updated build expression
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
==
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
Mon Sep 5 17:55:53 2011(r29033)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
Mon Sep 5 18:25:59 2011(r29034)
@@ -1,12 +1,15 @@
-{cabal, xmonad, xmonadContrib, X11, utf8String, X11Xft,
- parsec, split}:
+{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad
+, xmonadContrib
+}:
cabal.mkDerivation (self: {
pname = "xmonad-extras";
version = "0.9.2";
sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701";
- propagatedBuildInputs =
-[X11 xmonad xmonadContrib utf8String X11Xft parsec split];
+ buildDepends = [
+hint mtl network parsec random split X11 xmonad xmonadContrib
+ ];
+ configureFlags = "-f-with_hlist -f-with_mpd";
noHaddock = true;
meta = {
homepage = "http://projects.haskell.org/xmonad-extras";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29033 - in nixos/trunk/modules: programs/bash services/x11/desktop-managers
Author: eelco
Date: Mon Sep 5 17:55:53 2011
New Revision: 29033
URL: https://svn.nixos.org/websvn/nix/?rev=29033&sc=1
Log:
* Get the Virtuoso backend in Soprano/Nepomuk to work. Soprano tries
to find virtodbc_r.so in QT_PLUGIN_PATH (among other locations), so
make sure that Virtuoso can be found there.
Modified:
nixos/trunk/modules/programs/bash/bashrc.sh
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
Modified: nixos/trunk/modules/programs/bash/bashrc.sh
==
--- nixos/trunk/modules/programs/bash/bashrc.sh Mon Sep 5 17:29:45 2011
(r29032)
+++ nixos/trunk/modules/programs/bash/bashrc.sh Mon Sep 5 17:55:53 2011
(r29033)
@@ -45,7 +45,7 @@
# KDE/Gnome stuff.
export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
export
STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-export
QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+export
QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$i/lib:$QT_PLUGIN_PATH
export
QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Sep 5
17:29:45 2011(r29032)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Sep 5
17:55:53 2011(r29033)
@@ -109,6 +109,7 @@
pkgs.kde4.kdebase # contains kde-workspace etc.
pkgs.kde4.kde_wallpapers # contains kdm's default background
pkgs.kde4.oxygen_icons
+ pkgs.virtuoso # to enable Nepomuk to find Virtuoso
# Starts KDE's Polkit authentication agent.
pkgs.kde4.polkit_kde_agent
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29032 - nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth
Author: simons
Date: Mon Sep 5 17:29:45 2011
New Revision: 29032
URL: https://svn.nixos.org/websvn/nix/?rev=29032&sc=1
Log:
haskell-yesod-auth: updated to version 0.7.1.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Sep 5 17:29:41 2011(r29031)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-auth/default.nix
Mon Sep 5 17:29:45 2011(r29032)
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
- version = "0.7.1";
- sha256 = "066aq7c5gwbspbib748ky3lsb84llnb954n018fk5xs7b4gbyybk";
+ version = "0.7.1.1";
+ sha256 = "1jh9m8knrgjrm553s3y239ryvk8cv84v5yq8zng20b7marrhfy0p";
buildDepends = [
aesonNative authenticate blazeHtml controlMonadAttempt hamlet
httpEnumerator mimeMail persistent persistentTemplate pureMD5
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29031 - nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator
Author: simons
Date: Mon Sep 5 17:29:41 2011
New Revision: 29031
URL: https://svn.nixos.org/websvn/nix/?rev=29031&sc=1
Log:
haskell-xml-enumerator: updated to version 0.4.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Mon Sep 5 17:29:37 2011(r29030)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xml-enumerator/default.nix
Mon Sep 5 17:29:41 2011(r29031)
@@ -1,21 +1,19 @@
{ cabal, attoparsecText, attoparsecTextEnumerator, blazeBuilder
-, blazeBuilderEnumerator, enumerator, failure, text, transformers
-, xmlTypes
+, blazeBuilderEnumerator, dataDefault, enumerator, failure, text
+, transformers, xmlTypes
}:
cabal.mkDerivation (self: {
pname = "xml-enumerator";
- version = "0.3.4";
- sha256 = "0sfscsfcfmx56sdxc0wn2j1pyqjd9w92igz1n9xaph7zfz61g9k2";
- isLibrary = true;
- isExecutable = true;
+ version = "0.4.0";
+ sha256 = "1lgsm0xbz1f5941d8l3a9ipmwmffj1b8gp5a8if7r9davjf029xn";
buildDepends = [
attoparsecText attoparsecTextEnumerator blazeBuilder
-blazeBuilderEnumerator enumerator failure text transformers
-xmlTypes
+blazeBuilderEnumerator dataDefault enumerator failure text
+transformers xmlTypes
];
meta = {
-homepage = "http://github.com/snoyberg/xml-enumerator";;
+homepage = "http://github.com/snoyberg/xml";;
description = "Pure-Haskell utilities for dealing with XML with the
enumerator package";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29030 - nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator
Author: simons
Date: Mon Sep 5 17:29:37 2011
New Revision: 29030
URL: https://svn.nixos.org/websvn/nix/?rev=29030&sc=1
Log:
haskell-http-enumerator: updated to version 0.7.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Sep 5 17:29:34 2011(r29029)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Mon Sep 5 17:29:37 2011(r29030)
@@ -1,21 +1,21 @@
{ cabal, asn1Data, attoparsec, attoparsecEnumerator
, base64Bytestring, blazeBuilder, blazeBuilderEnumerator
-, caseInsensitive, certificate, cprngAes, enumerator, failure
-, httpTypes, monadControl, network, tls, tlsExtra, transformers
-, utf8String, zlibEnum
+, caseInsensitive, certificate, cprngAes, dataDefault, enumerator
+, failure, httpTypes, monadControl, network, tls, tlsExtra
+, transformers, utf8String, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "http-enumerator";
- version = "0.6.7";
- sha256 = "13x8p0dfaq2nkqh9ym7rbslnacvmdf5v1lpny2cia2im09hd1xbi";
+ version = "0.7.0";
+ sha256 = "0hbr03zv8y9maf9dh35d08pgbgj5dlqbaq158m576d4fnirmcapz";
isLibrary = true;
isExecutable = true;
buildDepends = [
asn1Data attoparsec attoparsecEnumerator base64Bytestring
blazeBuilder blazeBuilderEnumerator caseInsensitive certificate
-cprngAes enumerator failure httpTypes monadControl network tls
-tlsExtra transformers utf8String zlibEnum
+cprngAes dataDefault enumerator failure httpTypes monadControl
+network tls tlsExtra transformers utf8String zlibEnum
];
meta = {
homepage = "http://github.com/snoyberg/http-enumerator";;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29029 - nixpkgs/trunk/pkgs/development/libraries/haskell/digest
Author: simons
Date: Mon Sep 5 17:29:34 2011
New Revision: 29029
URL: https://svn.nixos.org/websvn/nix/?rev=29029&sc=1
Log:
haskell-digest: updated to version 0.0.1.0
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/digest/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/digest/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/digest/default.nix Mon Sep
5 17:29:28 2011(r29028)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/digest/default.nix Mon Sep
5 17:29:34 2011(r29029)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digest";
- version = "0.0.0.9";
- sha256 = "15gj3iq3jm4lnkc6hnj9v8p8ia3yzbsajwf9by3b1kpl449k2h29";
+ version = "0.0.1.0";
+ sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0";
extraLibraries = [ zlib ];
meta = {
description = "Various cryptographic hashes for bytestrings; CRC32 and
Adler32 for now";
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29028 - nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate
Author: simons
Date: Mon Sep 5 17:29:28 2011
New Revision: 29028
URL: https://svn.nixos.org/websvn/nix/?rev=29028&sc=1
Log:
haskell-authenticate: updated to version 0.10.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Mon Sep 5 14:58:26 2011(r29027)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/authenticate/default.nix
Mon Sep 5 17:29:28 2011(r29028)
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
- version = "0.10.1";
- sha256 = "03928v92s5j99r5v2jp9s4z87djj8dldkid8525aky0b0ghlnfhc";
+ version = "0.10.2";
+ sha256 = "02zgl7r2jpiw2srd6bzxkhxmbzvggbqs4qd4fhv7jn5y4jbwaw75";
buildDepends = [
aesonNative attoparsec base64Bytestring blazeBuilder
caseInsensitive enumerator failure httpEnumerator httpTypes network
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Hi,
On Mon, Sep 5, 2011 at 14:27, Ludovic Courtès wrote:
> Hi,
>
> Nicolas Pierron skribis:
>
>> What I can suggest is a paradigm shift for ~/.nixpkgs/config.nix which
>> would use a module like syntax, where the whole file is a function,
>
> It’s been the case for a long time already. Or did you mean something
> different?
I mean:
{pkgs, ...}:
{
git = pkgs.git {
opt_svn = true;
opt_ui = true;
};
mercurial = pkgs.mercurial {
python = pythonFull;
};
# This is almost the idea behind Gentoo attributes
opt_svn = false; # global setting.
mysql = null; # don't use mysql
}
--
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/
___
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
On 09/05/2011 10:59 AM, Eelco Dolstra wrote: Hi, On 09/03/2011 02:41 PM, Peter Simons wrote: this commit * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This was already the case on Linux 2.6.32, but in newer kernels the CFQ scheduler is built as a module, so all block devices got the ‘none’ scheduler instead. breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? This should be fixed now (r29027, tested with Linux 2.6.35). I still get this hang unless I set elevator=noop at boot. Using linuxPackages_2_6_39. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] CFQ I/O scheduler can't boot my system
Hi, On 09/03/2011 02:41 PM, Peter Simons wrote: this commit * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This was already the case on Linux 2.6.32, but in newer kernels the CFQ scheduler is built as a module, so all block devices got the ‘none’ scheduler instead. breaks my boot process. The linuxPackages_2_6_38_ati kernel hangs after probing the ata devices. I've reverted to an older version for now, but maybe I'm not the only one who's going to have that problem? This should be fixed now (r29027, tested with Linux 2.6.35). -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29027 - nixos/trunk/modules/system/boot
Author: eelco Date: Mon Sep 5 14:58:26 2011 New Revision: 29027 URL: https://svn.nixos.org/websvn/nix/?rev=29027&sc=1 Log: * Force loading of the CFQ module, i.e. don't do it on demand — that seems to cause weird modprobe hangs. Modified: nixos/trunk/modules/system/boot/kernel.nix Modified: nixos/trunk/modules/system/boot/kernel.nix == --- nixos/trunk/modules/system/boot/kernel.nix Mon Sep 5 13:29:33 2011 (r29026) +++ nixos/trunk/modules/system/boot/kernel.nix Mon Sep 5 14:58:26 2011 (r29027) @@ -165,9 +165,6 @@ # Unix domain sockets (needed by udev). "unix" -# Provide the CFQ scheduler in the initrd. -"cfq_iosched" - # Misc. stuff. "pcips2" "serio" "atkbd" "xtkbd" ]; @@ -177,7 +174,10 @@ "dm_mod" # For usual AT keyboards. -"i8042" +"i8042" + +# Provide the CFQ scheduler in the initrd. +"cfq_iosched" ]; # The Linux kernel >= 2.6.27 provides firmware. ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29026 - in nixpkgs/trunk/pkgs: development/compilers/ghc top-level
Author: andres
Date: Mon Sep 5 13:29:33 2011
New Revision: 29026
URL: https://svn.nixos.org/websvn/nix/?rev=29026&sc=1
Log:
Bumping the GHC HEAD snapshot.
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Mon Sep 5
10:14:42 2011(r29025)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Mon Sep 5
13:29:33 2011(r29026)
@@ -1,7 +1,7 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
stdenv.mkDerivation rec {
- version = "7.3.20110804";
+ version = "7.3.20110825";
name = "ghc-${version}";
@@ -10,7 +10,7 @@
src = fetchurl {
url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
-sha256 = "1n0prny5aaq09jp83skixla8frz5hcn8jbrc61m428q12jq1xsm7";
+sha256 = "06ngp3blg1nb1akiyxx2iypiwmybw4jg67lk9nmsn1jmj41v7dsm";
};
buildInputs = [ghc perl gmp ncurses];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 10:14:42
2011(r29025)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 13:29:33
2011(r29026)
@@ -2166,7 +2166,7 @@
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc721Prefs) false false lowPrio);
- # Still a release candidate.
+ # Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD =
haskellPackagesFun ../development/compilers/ghc/head.nix
ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio;
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Hi, Nicolas Pierron skribis: > What I can suggest is a paradigm shift for ~/.nixpkgs/config.nix which > would use a module like syntax, where the whole file is a function, It’s been the case for a long time already. Or did you mean something different? Thanks, Ludo’. ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] Nix - Issue 222
Nix #222 (5 Sep)By Eelco Dolstra--option ignored for some optionsThe following options don't work properly when overriden on the command line using --option, because --option is processed after this bit of code:
/* Get some settings from the configuration file. */
thisSystem = querySetting("system", SYSTEM);
maxBuildJobs = queryIntSetting("build-max-jobs", 1);
buildCores = queryIntSetting("build-cores", 1);
maxSilentTime = queryIntSetting("build-max-silent-time", 0);
buildTimeout = queryIntSetting("build-timeout", 0);
-- Issue on YellowGrass -- http://yellowgrass.org --
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Hi, On Mon, Sep 5, 2011 at 11:43, Eelco Dolstra wrote: > On 09/05/2011 11:19 AM, Nicolas Pierron wrote: > >> + optCall = f: x: >> + if builtins.isFunction f >> + then f x >> + else f; > > Attributes that can be both functions or not are a bad habit that we > shouldn't propagate further :-) It also makes behaviour of nixpkgs.config > inconsistent with the semantics of the ~/.nixpkgs/config.nix. Is there a > good reason for this? If the only case was to handle NixOS, then I wouldn't have accepted functions here. I have 3 reasons to use non-function and to give a separate syntax from ~/.nixpkgs/config.nix. The pkgs argument feels duplicated and non-consistent with the rest of modules arguments. Functions are hard to understand for non developers. Functions are not printable inside a documentation, thus they cannot be manipulated easily by a tool. Functions are causing merge problems (which was the case here). What I can suggest is a paradigm shift for ~/.nixpkgs/config.nix which would use a module like syntax, where the whole file is a function, and not only an attribute of the file. Then we should avoid getConfig, and only use override to define values of the options. Then converge to a gentoo like freedom of choice. -- Nicolas Pierron http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29025 - in nixos/trunk: doc/manual modules/misc
Author: eelco
Date: Mon Sep 5 10:14:42 2011
New Revision: 29025
URL: https://svn.nixos.org/websvn/nix/?rev=29025&sc=1
Log:
* Allow literal examples to be included in the manual.
Modified:
nixos/trunk/doc/manual/options-to-docbook.xsl
nixos/trunk/modules/misc/nixpkgs.nix
Modified: nixos/trunk/doc/manual/options-to-docbook.xsl
==
--- nixos/trunk/doc/manual/options-to-docbook.xsl Mon Sep 5 10:14:24
2011(r29024)
+++ nixos/trunk/doc/manual/options-to-docbook.xsl Mon Sep 5 10:14:42
2011(r29025)
@@ -52,12 +52,20 @@
+
Example:
-
-
-
+
+
+
+
+
+
+
+
+
+
Modified: nixos/trunk/modules/misc/nixpkgs.nix
==
--- nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 10:14:24 2011
(r29024)
+++ nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 10:14:42 2011
(r29025)
@@ -30,9 +30,9 @@
{
options = {
-nixpkgs.config = pkgs.lib.mkOption {
+nixpkgs.config = mkOption {
default = {};
- example =
+ example = literalExample
''
{ firefox.enableGeckoMediaPlayer = true;
packageOverrides = pkgs: {
@@ -54,7 +54,7 @@
'';
};
-nixpkgs.system = pkgs.lib.mkOption {
+nixpkgs.system = mkOption {
default = "";
description = ''
Specifies the Nix platform type for which NixOS should be built.
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29024 - nixpkgs/trunk/pkgs/lib
Author: eelco
Date: Mon Sep 5 10:14:24 2011
New Revision: 29024
URL: https://svn.nixos.org/websvn/nix/?rev=29024&sc=1
Log:
* Allow literal examples to be included in the manual.
Modified:
nixpkgs/trunk/pkgs/lib/options.nix
Modified: nixpkgs/trunk/pkgs/lib/options.nix
==
--- nixpkgs/trunk/pkgs/lib/options.nix Mon Sep 5 09:52:34 2011(r29023)
+++ nixpkgs/trunk/pkgs/lib/options.nix Mon Sep 5 10:14:24 2011(r29024)
@@ -287,5 +287,12 @@
else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x
["_args"])
else x;
-
+
+ /* For use in the ‘example’ option attribute. It causes the given
+ text to be included verbatim in documentation. This is necessary
+ for example values that are not simple values, e.g.,
+ functions. */
+ literalExample = text: { _type = "literalExample"; inherit text; };
+
+
}
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29023 - in nixpkgs/trunk/pkgs/development: libraries/haskell/ghc-events tools/haskell/threadscope
Author: andres
Date: Mon Sep 5 09:52:34 2011
New Revision: 29023
URL: https://svn.nixos.org/websvn/nix/?rev=29023&sc=1
Log:
Updated ghc-events and threadscope.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-events/default.nix
nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-events/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-events/default.nix
Mon Sep 5 09:46:14 2011(r29022)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-events/default.nix
Mon Sep 5 09:52:34 2011(r29023)
@@ -1,13 +1,12 @@
-{cabal, binary, mtl}:
+{ cabal, binary, mtl }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "ghc-events";
- version = "0.2.0.1";
- sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6";
- propagatedBuildInputs = [binary mtl];
- preConfigure = ''
-sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal
- '';
+ version = "0.3.0.1";
+ sha256 = "08jnri6cwybg8b2f53rn8y1xzcpz32r0svahcw01g837p07mcpla";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ binary mtl ];
meta = {
description = "Library and tool for parsing .eventlog files from GHC";
license = self.stdenv.lib.licenses.bsd3;
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
==
--- nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
Mon Sep 5 09:46:14 2011(r29022)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/threadscope/default.nix
Mon Sep 5 09:52:34 2011(r29023)
@@ -1,15 +1,15 @@
-{ cabal, binary, cairo, ghcEvents, glade, gtk, mtl }:
+{ cabal, binary, cairo, ghcEvents, glib, gtk, mtl, pango }:
cabal.mkDerivation (self: {
pname = "threadscope";
- version = "0.1.3";
- sha256 = "1vak3624vrnkfvwxzfw5hkc0552v213jb874f6q536g5vhjjxpih";
+ version = "0.2.0";
+ sha256 = "0b8lc8han4d90wgzliy80l1gbkm09gg6qxsn37blj41wzl6yzr9k";
isLibrary = false;
isExecutable = true;
- buildDepends = [ binary cairo ghcEvents glade gtk mtl ];
+ buildDepends = [ binary cairo ghcEvents glib gtk mtl pango ];
configureFlags = "--ghc-options=-rtsopts";
meta = {
-description = "A graphical thread profiler";
+description = "A graphical tool for profiling parallel Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29022 - nixos/trunk/modules/misc
Author: eelco
Date: Mon Sep 5 09:46:14 2011
New Revision: 29022
URL: https://svn.nixos.org/websvn/nix/?rev=29022&sc=1
Log:
* Fix description.
Modified:
nixos/trunk/modules/misc/nixpkgs.nix
Modified: nixos/trunk/modules/misc/nixpkgs.nix
==
--- nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 09:19:59 2011
(r29021)
+++ nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 09:46:14 2011
(r29022)
@@ -32,20 +32,25 @@
nixpkgs.config = pkgs.lib.mkOption {
default = {};
- example = {
-firefox.enableGeckoMediaPlayer = true;
- };
+ example =
+''
+ { firefox.enableGeckoMediaPlayer = true;
+packageOverrides = pkgs: {
+ firefox60Pkgs = pkgs.firefox60Pkgs.override {
+enableOfficialBranding = true;
+ };
+};
+ }
+'';
type = configType;
description = ''
-The configuration of the Nix Packages collection. This expression
-defines default value of attributes and allow packages to be
-overriden globally via the `packageOverrides'.
-
-the `packageOverrides' configuration option must be a set of new or
-overriden packages. Any occurence of `pkgs' inside this attribute
-set refers to the *original* (un-overriden) set of packages,
-allowing packageOverrides attributes to refer to the original
-attributes (e.g. "packageOverrides.foo = ... pkgs.foo ...").
+The configuration of the Nix Packages collection. (For
+details, see the Nixpkgs documentation.) It allows you to set
+package configuration options, and to override packages
+globally through the packageOverrides
+option. The latter is a function that takes as an argument
+the original Nixpkgs, and must evaluate
+to a set of new or overriden packages.
'';
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Hi, On 09/05/2011 11:19 AM, Nicolas Pierron wrote: + optCall = f: x: +if builtins.isFunction f +then f x +else f; Attributes that can be both functions or not are a bad habit that we shouldn't propagate further :-) It also makes behaviour of nixpkgs.config inconsistent with the semantics of the ~/.nixpkgs/config.nix. Is there a good reason for this? -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r29020 - in nixos/trunk/modules: hardware/network installer/scan
Author: NicolasPierron
Date: Mon Sep 5 09:19:55 2011
New Revision: 29020
URL: https://svn.nixos.org/websvn/nix/?rev=29020&sc=1
Log:
Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).
Added:
nixos/trunk/modules/hardware/network/intel-6000g2a.nix
nixos/trunk/modules/hardware/network/intel-6000g2b.nix
Modified:
nixos/trunk/modules/installer/scan/not-detected.nix
Added: nixos/trunk/modules/hardware/network/intel-6000g2a.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/hardware/network/intel-6000g2a.nix Mon Sep 5
09:19:55 2011(r29020)
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+ hardware.firmware = [ pkgs.iwlwifi6000g2aucode ];
+}
Added: nixos/trunk/modules/hardware/network/intel-6000g2b.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/hardware/network/intel-6000g2b.nix Mon Sep 5
09:19:55 2011(r29020)
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+ hardware.firmware = [ pkgs.iwlwifi6000g2bucode ];
+}
Modified: nixos/trunk/modules/installer/scan/not-detected.nix
==
--- nixos/trunk/modules/installer/scan/not-detected.nix Mon Sep 5 08:33:07
2011(r29019)
+++ nixos/trunk/modules/installer/scan/not-detected.nix Mon Sep 5 09:19:55
2011(r29020)
@@ -8,6 +8,8 @@
imports =
[ ../../hardware/network/intel-5000.nix
../../hardware/network/intel-6000.nix
+ ../../hardware/network/intel-6000g2a.nix
+ ../../hardware/network/intel-6000g2b.nix
];
config = mkDefault {
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc
Author: NicolasPierron
Date: Mon Sep 5 09:19:59 2011
New Revision: 29021
URL: https://svn.nixos.org/websvn/nix/?rev=29021&sc=1
Log:
Add merge capabilities to nixpkgs.config option.
Modified:
nixos/trunk/modules/misc/nixpkgs.nix
Modified: nixos/trunk/modules/misc/nixpkgs.nix
==
--- nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 09:19:55 2011
(r29020)
+++ nixos/trunk/modules/misc/nixpkgs.nixMon Sep 5 09:19:59 2011
(r29021)
@@ -1,5 +1,32 @@
{ config, pkgs, ... }:
+with pkgs.lib;
+
+let
+ isConfig = x:
+builtins.isAttrs x || builtins.isFunction x;
+
+ optCall = f: x:
+if builtins.isFunction f
+then f x
+else f;
+
+ mergeConfig = lhs: rhs:
+lhs // rhs //
+optionalAttrs (lhs ? packageOverrides) {
+ packageOverrides = pkgs:
+optCall lhs.packageOverrides pkgs //
+optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+};
+
+ configType = mkOptionType {
+name = "nixpkgs config";
+check = traceValIfNot isConfig;
+merge = fold mergeConfig {};
+ };
+
+in
+
{
options = {
@@ -8,8 +35,17 @@
example = {
firefox.enableGeckoMediaPlayer = true;
};
+ type = configType;
description = ''
-The configuration of the Nix Packages collection.
+The configuration of the Nix Packages collection. This expression
+defines default value of attributes and allow packages to be
+overriden globally via the `packageOverrides'.
+
+the `packageOverrides' configuration option must be a set of new or
+overriden packages. Any occurence of `pkgs' inside this attribute
+set refers to the *original* (un-overriden) set of packages,
+allowing packageOverrides attributes to refer to the original
+attributes (e.g. "packageOverrides.foo = ... pkgs.foo ...").
'';
};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29018 - in nixpkgs/trunk/pkgs: os-specific/linux/firmware/iwlwifi-6000g2a-ucode os-specific/linux/firmware/iwlwifi-6000g2b-ucode top-level
Author: NicolasPierron
Date: Mon Sep 5 08:33:03 2011
New Revision: 29018
URL: https://svn.nixos.org/websvn/nix/?rev=29018&sc=1
Log:
Add additional Intel firmwares (naming iwlwifig2{a,b}-ucode).
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
Mon Sep 5 08:33:03 2011(r29018)
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "iwlwifi-6000g2a-ucode-17.168.5.3";
+
+ src = fetchurl {
+url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";;
+sha256 =
"febbbc0851db17296d35e5ca1d9266c1a14e9a9ae6ce41a36578c44971ae79f9";
+ };
+
+ buildPhase = "true";
+
+ installPhase = ''
+ensureDir "$out"
+chmod -x *
+cp * "$out"
+ '';
+
+ meta = {
+description = "Firmware for the Intel 6000 Series Gen2 wireless card";
+
+longDescription = ''
+ This package provides the Intel 6000 Series wireless card
+ firmware. It contains the `iwlwifi-6000g2a-5.ucode' file.
+'';
+
+homepage = http://intellinuxwireless.org/;
+ };
+}
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
Mon Sep 5 08:33:03 2011(r29018)
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "iwlwifi-6000g2b-ucode-17.168.5.2";
+
+ src = fetchurl {
+url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";;
+sha256 =
"5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052";
+ };
+
+ buildPhase = "true";
+
+ installPhase = ''
+ensureDir "$out"
+chmod -x *
+cp * "$out"
+ '';
+
+ meta = {
+description = "Firmware for the Intel 6000 Series Gen2 wireless card";
+
+longDescription = ''
+ This package provides the Intel 6000 Series wireless card
+ firmware. It contains the `iwlwifi-6000g2b-4.ucode' file.
+'';
+
+homepage = http://intellinuxwireless.org/;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 08:32:55
2011(r29017)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 08:33:03
2011(r29018)
@@ -5175,6 +5175,10 @@
iwlwifi6000ucode = callPackage
../os-specific/linux/firmware/iwlwifi-6000-ucode { };
+ iwlwifi6000g2aucode = callPackage
../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { };
+
+ iwlwifi6000g2bucode = callPackage
../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { };
+
kbd = callPackage ../os-specific/linux/kbd { };
libaio = callPackage ../os-specific/linux/libaio { };
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29019 - nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird
Author: NicolasPierron Date: Mon Sep 5 08:33:07 2011 New Revision: 29019 URL: https://svn.nixos.org/websvn/nix/?rev=29019&sc=1 Log: Thunderbird 5.x: Add Linux as a build platform. Modified: nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix Modified: nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix == --- nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix Mon Sep 5 08:33:03 2011(r29018) +++ nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix Mon Sep 5 08:33:07 2011(r29019) @@ -79,5 +79,6 @@ # see http://www.mozilla.org/foundation/licensing.html if enableOfficialBranding then licenses.proprietary else licenses.mpl11; maintainers = with maintainers; [ pierron ]; +platforms = with platforms; linux; }; } ___ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29017 - in nixpkgs/trunk/pkgs: tools/backup/rdiff-backup top-level
Author: NicolasPierron
Date: Mon Sep 5 08:32:55 2011
New Revision: 29017
URL: https://svn.nixos.org/websvn/nix/?rev=29017&sc=1
Log:
rdiff-backup: Fix nix expression.
Modified:
nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nix
==
--- nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nixMon Sep 5
08:31:49 2011(r29016)
+++ nixpkgs/trunk/pkgs/tools/backup/rdiff-backup/default.nixMon Sep 5
08:32:55 2011(r29017)
@@ -1,4 +1,5 @@
-args: with args;
+{stdenv, fetchurl, python, librsync, gnused }:
+
stdenv.mkDerivation {
name = "rdiff-backup-1.1.14";
@@ -7,9 +8,9 @@
sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
};
- phases = "installPhase";
+ phases = "unpackPhase installPhase";
installPhase = ''
-python setup.py install --prefix=$out
+python ./setup.py install --prefix=$out
sed -i $out/bin/rdiff-backup -e \
"/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]"
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 08:31:49
2011(r29016)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Sep 5 08:32:55
2011(r29017)
@@ -1227,10 +1227,7 @@
replace = callPackage ../tools/text/replace { };
- /*
- rdiff_backup = callPackage ../tools/backup/rdiff-backup {
-python=python; };
- */
+ rdiff_backup = callPackage ../tools/backup/rdiff-backup { };
ripmime = callPackage ../tools/networking/ripmime {};
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r29016 - nixpkgs/trunk/pkgs/applications/version-management/meld
Author: viric
Date: Mon Sep 5 08:31:49 2011
New Revision: 29016
URL: https://svn.nixos.org/websvn/nix/?rev=29016&sc=1
Log:
Updating meld
Modified:
nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix
Modified: nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix Sun Sep
4 23:06:11 2011(r29015)
+++ nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix Mon Sep
5 08:31:49 2011(r29016)
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
+{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }:
let
minor = "1.5";
- version = "${minor}.1";
+ version = "${minor}.2";
in
stdenv.mkDerivation {
name = "meld-${version}";
src = fetchurl {
-url =
"http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2";;
-sha256 = "0ykj3rb5hvcr4dmc52mz8q3iknrsh042v1x7yvffgs6yibakcac2";
+url =
"http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";;
+sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
};
- buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
+ buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ];
patchPhase = ''
sed -e s,/usr/local,$out, -i INSTALL
___
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
