JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons 2013-10-27 10:58:24 +01:00
commit 9eea6c64fb
10 changed files with 83 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -59,6 +59,7 @@
vcunat = "Vladimír Čunát <vcunat@gmail.com>";
viric = "Lluís Batlle i Rossell <viric@viric.name>";
vizanto = "Danny Wilson <danny@prime.vc>";
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
zef = "Zef Hemel <zef@zef.me>";

25
nixos/doc/manual/development.xml
View File

@ -30,12 +30,11 @@ or
$ mkdir -p <replaceable>/my/sources</replaceable>
$ cd <replaceable>/my/sources</replaceable>
$ nix-env -i git
$ git clone git://github.com/NixOS/nixos.git
$ git clone git://github.com/NixOS/nixpkgs.git
</screen>
This will check out the latest NixOS sources to
<filename><replaceable>/my/sources</replaceable>/nixos</filename> and
<filename><replaceable>/my/sources</replaceable>/nixpkgs/nixos</filename> and
the Nixpkgs sources to
<filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
If you want to rebuild your system using your (modified) sources, you
@ -43,7 +42,7 @@ need to tell <command>nixos-rebuild</command> about them using the
<option>-I</option> flag:
<screen>
$ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
$ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>/nixpkgs
</screen>
</para>
@ -250,7 +249,7 @@ let
in
{
imports = [ /etc/nixos/nixos/modules/services/scheduling/cron.nix ];
imports = [ /path/to/nixpkgs/nixos/modules/services/scheduling/cron.nix ];
options = {
services.locate = {
@ -307,10 +306,10 @@ in
<para>
<screen>
$ nix-build /etc/nixos/nixos -A <replaceable>attr</replaceable></screen>
$ nix-build /path/to/nixpkgs/nixos -A <replaceable>attr</replaceable></screen>
where <replaceable>attr</replaceable> is an attribute in
<filename>/etc/nixos/nixos/default.nix</filename>. Attributes of interest include:
<filename>/path/to/nixpkgs/nixos/default.nix</filename>. Attributes of interest include:
<variablelist>
@ -344,7 +343,7 @@ Most parts of NixOS can be built through the <varname>config</varname>
attribute set. This attribute set allows you to have a view of the merged
option definitions and all its derivations. Important derivations are store
inside the option <option>system.build</option> and can be listed with the
command <command>nix-instantiate --xml --eval-only /etc/nixos/nixos -A
command <command>nix-instantiate --xml --eval-only /path/to/nixpkgs/nixos -A
config.system.build</command>
</para>
@ -368,8 +367,8 @@ you have to set <envar>NIXOS_CONFIG</envar> before
running <command>nix-build</command> to build the ISO.
<screen>
$ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
$ nix-build /etc/nixos/nixos -A config.system.build.isoImage</screen>
$ export NIXOS_CONFIG=/path/to/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
$ nix-build /path/to/nixpkgs/nixos -A config.system.build.isoImage</screen>
</para>
@ -413,8 +412,8 @@ tedious, so here is a quick way to see if the installer works
properly:
<screen>
$ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
$ nix-build /etc/nixos/nixos -A config.system.build.nixos-install
$ export NIXOS_CONFIG=/path/to/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
$ nix-build /path/to/nixpkgs/nixos -A config.system.build.nixos-install
$ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
$ yes | mke2fs -j diskimage
$ mount -o loop diskimage /mnt
@ -437,8 +436,8 @@ boot correctly is to use QEMU’s <option>-kernel</option> and
<option>-initrd</option> options:
<screen>
$ nix-build /etc/nixos/nixos -A config.system.build.initialRamdisk -o initrd
$ nix-build /etc/nixos/nixos -A config.system.build.kernel -o kernel
$ nix-build /path/to/nixpkgs/nixos -A config.system.build.initialRamdisk -o initrd
$ nix-build /path/to/nixpkgs/nixos -A config.system.build.kernel -o kernel
$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
</screen>

8
nixos/doc/manual/man-nixos-option.xml
View File

@ -120,10 +120,10 @@ Declared by:
/mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix
Defined by:
/etc/nixos/nixos/modules/system/boot/kernel.nix
/etc/nixos/nixos/modules/hardware/network/rt73.nix
/etc/nixos/nixos/modules/hardware/network/intel-3945abg.nix
/etc/nixos/nixos/modules/hardware/network/intel-2200bg.nix</screen></para>
/path/to/nixpkgs/nixos/modules/system/boot/kernel.nix
/path/to/nixpkgs/nixos/modules/hardware/network/rt73.nix
/path/to/nixpkgs/nixos/modules/hardware/network/intel-3945abg.nix
/path/to/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix</screen></para>
</refsection>

2
nixos/doc/manual/man-nixos-rebuild.xml
View File

@ -106,7 +106,7 @@ desired operation. It must be one of the following:
points to the output of the top-level “system” derivation. This
is essentially the same as doing
<screen>
$ nix-build /etc/nixos/nixos -A system
$ nix-build /path/to/nixpkgs/nixos -A system
</screen>
Note that you do not need to be <literal>root</literal> to run
<command>nixos-rebuild build</command>.</para>

21
pkgs/applications/graphics/gpicview/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }:
stdenv.mkDerivation {
name = "gpicview-0.2.4";
src = fetchurl {
url = "mirror://sourceforge/lxde/gpicview-0.2.4.tar.gz";
sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr";
};
meta = with stdenv.lib; {
description = "A simple and fast image viewer for X";
homepage = http://lxde.sourceforge.net/gpicview/;
repositories.git = git://lxde.git.sourceforge.net/gitroot/lxde/gpicview;
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
buildInputs = [ intltool pkgconfig gtk2 ];
}

36
pkgs/applications/misc/redshift/default.nix
View File

@ -1,18 +1,34 @@
{ fetchurl, stdenv,
libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python,
randrproto, xcbutil, xf86vidmodeproto }:
{ fetchurl, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
, randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
, GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg }:
stdenv.mkDerivation rec {
pname = "redshift";
version = "1.7";
name = "${pname}-${version}";
version = "1.8";
name = "redshift-${version}";
src = fetchurl {
url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "1j0hs0vnlic90cf4bryn11n4ani1x2s5l8z6ll3fmrlw98ykrylv";
url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
sha256 = "1srj2dwy32h71iqikb4ysv5ipclym80i9lys2ns8vjmclg7hj3vi";
};
buildInputs = [ libX11 libXrandr libXxf86vm libxcb pkgconfig python
randrproto xcbutil xf86vidmodeproto ];
buildInputs = [
libX11 libXrandr libXxf86vm libxcb pkgconfig python randrproto xcbutil
xf86vidmodeproto autoconf automake gettext glib GConf dbus dbus_glib
makeWrapper gtk pygtk pyxdg
# TODO:
# geoclue
];
preConfigure = ''
./bootstrap
'';
preInstall = ''
substituteInPlace src/redshift-gtk/redshift-gtk python --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
'';
postInstall = ''
wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
'';
meta = {
description = "changes the color temperature of your screen gradually";

4
pkgs/development/compilers/ghc/head.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.7.20130816";
version = "7.7.20130828";
name = "ghc-${version}";
src = fetchurl {
url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
sha256 = "0w636gfjn3xigrlj31z4hy9kv44svyifsqcshrq95qxijx396j5m";
sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv";
};
buildInputs = [ ghc perl gmp ncurses ];

6
pkgs/os-specific/linux/microcode/intel.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, microcode2ucode }:
let version = "20130808"; in
let version = "20130906"; in
stdenv.mkDerivation {
name = "microcode-intel-${version}";
src = fetchurl {
url = "http://downloadmirror.intel.com/23082/eng/microcode-${version}.tgz";
sha256 = "19v0059v6dxv7ly57wgqy9nkjjnmprgwz4s94khdf213k5vikpfm";
url = "http://downloadmirror.intel.com/23166/eng/microcode-${version}.tgz";
sha256 = "11k327icvijadq2zkgkc3sqwzraip9cviqm25566g09523ds0svv";
};
buildInputs = [ microcode2ucode ];

4
pkgs/top-level/all-packages.nix
View File

@ -7810,6 +7810,8 @@ let
goldendict = callPackage ../applications/misc/goldendict { };
gpicview = callPackage ../applications/graphics/gpicview { };
grass = import ../applications/misc/grass {
inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm
libXaw libXrender;
@ -9638,6 +9640,8 @@ let
redshift = callPackage ../applications/misc/redshift {
inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
xf86vidmodeproto;
inherit (gnome) GConf;
inherit (pythonPackages) pyxdg;
};
oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };

9
pkgs/top-level/perl-packages.nix
View File

@ -3396,6 +3396,15 @@ rec {
propagatedBuildInputs = [ HTTPDate ];
};
FileMimeInfo = buildPerlPackage {
name = "File-MimeInfo-0.20";
src = fetchurl {
url = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/File-MimeInfo-0.20.tar.gz";
sha256 = "1738yi3a0xcbvffqymjb6cyh999q4pryalfwbkmdbjdks2y0bxz0";
};
propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ];
};
FileModified = buildPerlPackage {
name = "File-Modified-0.07";
src = fetchurl {