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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/atop/default.nix
View File

@@ -1,12 +1,12 @@
{stdenv, fetchurl, zlib, ncurses}:
stdenv.mkDerivation rec {
version = "2.1-1";
version = "2.2-3";
name = "atop-${version}";
src = fetchurl {
url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
sha256 = "17wqqyym4d02cqmn1l1asah3sld939nlkc84g4ad939kpkzd98ir";
sha256 = "0p85isn6zih3xfprjym5xanqzazwqjj8x2mmwqyqpqjv6nibi1f7";
};
buildInputs = [zlib ncurses];
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p "$out"/{bin,sbin}
make systemdinstall $makeFlags
'';
meta = {

4
pkgs/os-specific/linux/eudev/default.nix
View File

@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="eudev";
version = "3.1.1";
version = "3.1.2";
name="${baseName}-${version}";
url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
sha256 = "1r1jbk1fwc4wl0ifm7xzkb2vjd8w1a39hx6mmy4pp4fl2gvcg86k";
sha256 = "0wq2w67ip957l5bi21jj3w2rv7s7klcrnlg6zpg1g0fxjfgbd4s3";
};
buildInputs = [
glib pkgconfig gperf utillinux

4
pkgs/os-specific/linux/mcelog/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub }:
let version = "120"; in
let version = "121"; in
stdenv.mkDerivation {
name = "mcelog-${version}";
src = fetchFromGitHub {
sha256 = "1x50g0vrarcv31x4xszcxkpwklkq6mrv2xr1dxbbds26qz8jk11l";
sha256 = "1psdcbr3ssavl35svjzgsy5xl0f2s57s740anvyqy8ziy4k5fjyv";
rev = "v${version}";
repo = "mcelog";
owner = "andikleen";

2
pkgs/os-specific/linux/nvidia-x11/legacy340.nix
View File

@@ -25,6 +25,8 @@ stdenv.mkDerivation {
builder = ./builder-legacy340.sh;
patches = [ ./nvidia-340.76-kernel-4.0.patch ];
src =
if stdenv.system == "i686-linux" then
fetchurl {

28
pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch Normal file
View File

@@ -0,0 +1,28 @@
--- a/kernel/nv-pat.c 2015-07-03 08:39:35.417031728 +0200
+++ b/kernel/nv-pat.c 2015-07-03 08:42:15.631838988 +0200
@@ -35,8 +35,13 @@
unsigned long cr0 = read_cr0();
write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
wbinvd();
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
*cr4 = read_cr4();
if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
+#else
+ *cr4 = __read_cr4();
+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
+#endif
__flush_tlb();
}
@@ -46,7 +51,11 @@
wbinvd();
__flush_tlb();
write_cr0((cr0 & 0x9fffffff));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
if (cr4 & 0x80) write_cr4(cr4);
+#else
+ if (cr4 & 0x80) __write_cr4(cr4);
+#endif
}
static int nv_determine_pat_mode(void)

16
pkgs/os-specific/linux/pam_mount/default.nix
View File

@@ -1,21 +1,27 @@
{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }:
{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
stdenv.mkDerivation rec {
name = "pam_mount-2.14";
name = "pam_mount-2.15";
src = fetchurl {
url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz";
sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg";
url = "mirror://sourceforge/pam-mount/pam_mount/2.15/${name}.tar.xz";
sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5";
};
buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
preConfigure = "sh autogen.sh --prefix=$out";
patches = [ ./insert_utillinux_path_hooks.patch ];
preConfigure = ''
substituteInPlace src/mtcrypt.c --replace @@NIX_UTILLINUX@@ ${utillinux}/bin
sh autogen.sh --prefix=$out
'';
makeFlags = "DESTDIR=$(out)";
# Probably a hack, but using DESTDIR and PREFIX makes everything work!
postInstall = ''
mkdir -p $out
cp -r $out/$out/* $out
rm -r $out/nix
'';

30
pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch Normal file
View File

@@ -0,0 +1,30 @@
diff -uNr pam_mount-2.15_old/src/mtcrypt.c pam_mount-2.15/src/mtcrypt.c
--- pam_mount-2.15_old/src/mtcrypt.c 2015-07-04 16:00:12.917943336 +0200
+++ pam_mount-2.15/src/mtcrypt.c 2015-07-04 16:03:45.685302493 +0200
@@ -534,7 +534,7 @@
/* candidate for replacement by some libmount calls, I guess. */
argk = 0;
- mount_args[argk++] = "mount";
+ mount_args[argk++] = "@@NIX_UTILLINUX@@/mount";
if (opt->fstype != NULL) {
mount_args[argk++] = "-t";
mount_args[argk++] = opt->fstype;
@@ -668,7 +668,7 @@
if (!opt->no_update)
pmt_smtab_remove(mntpt, SMTABF_MOUNTPOINT);
- rmt_args[argk++] = "mount";
+ rmt_args[argk++] = "@@NIX_UTILLINUX@@/mount";
rmt_args[argk++] = "-o";
rmt_args[argk++] = opt->extra_opts;
rmt_args[argk++] = mntpt;
@@ -749,7 +749,7 @@
pmt_smtab_remove(mountpoint, SMTABF_MOUNTPOINT);
pmt_cmtab_remove(mountpoint);
- umount_args[argk++] = "umount";
+ umount_args[argk++] = "@@NIX_UTILLINUX@@/umount";
umount_args[argk++] = "-i";
umount_args[argk++] = mountpoint;
umount_args[argk] = NULL;

6
pkgs/os-specific/linux/perf-tools/default.nix
View File

@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation {
name = "perf-tools-20150130";
name = "perf-tools-20150704";
src = fetchFromGitHub {
owner = "brendangregg";
repo = "perf-tools";
rev = "85414b01247666c9fefad25a1406c8078011c936";
sha256 = "1g15nnndcmxd1k9radcvfpn223pp627vs9wh90yiy73v03g7b8cs";
rev = "30ff4758915a98fd43020c1b45a63341208fd8b9";
sha256 = "0x59xm96jmpfgik6f9d6q6v85dip3kvi4ncijpghhg59ayyd5i6a";
};
buildInputs = [ perl ];

4
pkgs/os-specific/linux/spl/default.nix
View File

@@ -1,13 +1,13 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "0.6.4.1";
version = "0.6.4.2";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "spl";
rev = "spl-${version}";
sha256 = "1rlflraj66ag2gcvzsyfl4zwhq4846ifyzdmnnmscwmdf2qxc1l8";
sha256 = "101c5fzhnz67ix5w33rb2pwazxmyz6rfvyszbwy1kgh6rz75bjr4";
};
patches = [ ./const.patch ./install_prefix.patch ];

6
pkgs/os-specific/linux/spl/git.nix
View File

@@ -1,12 +1,12 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-06-10";
version = "2015-06-29";
src = fetchgit {
url = git://github.com/zfsonlinux/spl.git;
rev = "2345368646151718fa59986d9e2d9d38bcdecb2c";
sha256 = "08k7ahqgqrf9i118mkfxm01h8s607zp8lyvbvm1crii50dwlvl3g";
rev = "77ab5dd33a99bdf7fb062f0ea327582236a225b3";
sha256 = "1hbn8hi305cn15nlcm9x99nczjqjkhdc38hzww11xn78py8d90w9";
};
patches = [ ./const.patch ./install_prefix.patch ];

4
pkgs/os-specific/linux/udisks/2-default.nix
View File

@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "udisks-2.1.4";
name = "udisks-2.1.6";
src = fetchurl {
url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
sha256 = "1fqrwmdyn5vc5r7wixh2f013ca1qf3kwy4ia8mh9282a7bfliqd4";
sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
};
patches = [ ./force-path.patch ];

22
pkgs/os-specific/linux/xsensors/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }:
stdenv.mkDerivation rec {
name = "xsensors-${version}";
version = "0.70";
src = fetchurl {
url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz";
sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh";
};
buildInputs = [
gtk2 pkgconfig lm_sensors
];
patches = [
./remove-unused-variables.patch
./replace-deprecated-gtk.patch
];
meta = with lib; {
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
};
}

39
pkgs/os-specific/linux/xsensors/remove-unused-variables.patch Normal file
View File

@@ -0,0 +1,39 @@
Author: Nanley Chery <nanleychery@gmail.com>
From: Jean Delvare <khali@linux-fr.org>
Subject: Remove declared, but unused variables
Bug-Debian: http://bugs.debian.org/625435
---
--- a/src/gui.c
+++ b/src/gui.c
@@ -257,10 +257,9 @@
/* Start the sensor info update timer. */
gint start_timer( GtkWidget *widget, gpointer data ) {
- gint timer;
/* Setup timer for updates. */
- timer = g_timeout_add( update_time * 1000,
+ g_timeout_add( update_time * 1000,
(GtkFunction) update_sensor_data,
(gpointer) data );
@@ -287,7 +286,7 @@
/* feature data */
updates *head = NULL;
- updates *current = NULL, *prev = NULL;
+ updates *current = NULL;
const sensors_feature *feature;
@@ -347,10 +346,8 @@
new_node->pbar = featpbar;
if ( head == NULL ) {
- prev = head;
head = current = new_node;
} else {
- prev = current;
current = current->next = new_node;
}

168
pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch Normal file
View File

@@ -0,0 +1,168 @@
Author: Nanley Chery <nanleychery@gmail.com>
Subject: Update deprecated gtk casts and replace deprecated function calls with their analogous cairo counterparts.
Bug-Debian: http://bugs.debian.org/622005
Bug-Debian: http://bugs.debian.org/610321
---
--- a/src/gui.c
+++ b/src/gui.c
@@ -27,10 +27,10 @@
GtkWidget *mainwindow = NULL;
GdkColor colorWhite = { 0, 0xFFFF, 0xFFFF, 0xFFFF };
-
-GdkColormap *cmap = NULL;
-GdkPixmap *theme = NULL;
+GdkPixbuf *theme = NULL;
+
+cairo_surface_t *surface = NULL;
/* Destroy the main window. */
gint destroy_gui( GtkWidget *widget, gpointer data ) {
@@ -76,17 +76,16 @@
}
}
-static void draw_digits( GtkWidget *widget, const gchar *digits, int highLow )
+static void draw_digits( GtkWidget *widget, cairo_t *cr, const gchar *digits, int highLow )
{
const gchar *digit = digits;
int pos = 0, x = 0, y = 0, w = 0;
while ( *digit ) {
get_pm_location( *digit, &x, &y, &w );
- gdk_draw_drawable( widget->window,
- widget->style->fg_gc[ GTK_WIDGET_STATE
- (widget) ], theme, x, y + highLow,
- pos, 0, w, 30 );
+ cairo_set_source_surface (cr, surface, pos-x, 0-(y + highLow));
+ cairo_rectangle(cr, pos, 0, w, 30);
+ cairo_fill(cr);
pos += w;
digit++;
}
@@ -102,6 +101,8 @@
gchar result[7];
+ cairo_t *cr = gdk_cairo_create(widget->window);
+
#ifdef DEBUG_XSENSORS
printf( "area.width = %d, area.height = %d\n", event->area.width,
event->area.height );
@@ -117,13 +118,11 @@
/* Display the digits */
if ( g_snprintf( result, 6, "%5.0f", current->curvalue ) >= 0 )
- draw_digits( widget, result, highLow );
+ draw_digits( widget, cr, result, highLow );
/* Display RPM */
- gdk_draw_drawable( widget->window,
- widget->style->fg_gc[ GTK_WIDGET_STATE
- (widget) ], theme, 0, 120 + highLow,
- 90, 0, 57, 30 );
+ cairo_set_source_surface (cr, surface, 90-0, 0-(120 + highLow));
+ cairo_rectangle(cr, 90, 0, 57, 30);
break;
case TEMP:
if ( current->curvalue > current->curmax )
@@ -134,17 +133,15 @@
/* Display the digits */
if ( g_snprintf( result, 7, "%6.1f", current->curvalue ) >= 0 )
- draw_digits( widget, result, highLow );
+ draw_digits( widget, cr, result, highLow );
/* Display degree symbol */
if ( tf == FALSE )
x = 0;
else
x = 57;
- gdk_draw_drawable( widget->window,
- widget->style->fg_gc[ GTK_WIDGET_STATE
- (widget) ], theme, x, 60 + highLow,
- 96, 0, 57, 30 );
+ cairo_set_source_surface (cr, surface, 96-x, 0-(60 + highLow));
+ cairo_rectangle(cr, 96, 0, 57, 30);
break;
case VOLT:
@@ -154,20 +151,17 @@
/* Display the digits */
if ( g_snprintf( result, 7, "%6.2f", current->curvalue ) >= 0 )
- draw_digits( widget, result, highLow );
+ draw_digits( widget, cr, result, highLow );
/* Display V */
- gdk_draw_drawable( widget->window,
- widget->style->fg_gc[ GTK_WIDGET_STATE
- (widget) ], theme, 114, 60 + highLow,
- 96, 0, 57, 30 );
-
-
+ cairo_set_source_surface (cr, surface, 96-114, 0-(60 + highLow));
+ cairo_rectangle(cr, 96, 0, 57, 30);
break;
default:
break;
}
-
+ cairo_fill(cr);
+ cairo_destroy(cr);
return TRUE;
}
@@ -260,7 +254,7 @@
/* Setup timer for updates. */
g_timeout_add( update_time * 1000,
- (GtkFunction) update_sensor_data,
+ (GSourceFunc) update_sensor_data,
(gpointer) data );
return SUCCESS;
@@ -460,8 +454,6 @@
g_signal_connect( G_OBJECT (mainwindow), "delete_event",
G_CALLBACK (destroy_gui), NULL );
- /* Graphics needed for drawing info. */
- cmap = gtk_widget_get_colormap( mainwindow );
/* Set up the image file used for displaying characters. */
if ( imagefile == NULL ) {
@@ -481,12 +473,10 @@
"Image file not found in either location! Exiting!\n" );
exit( 1 );
} else {
- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap,
- NULL, NULL, "./images/default.xpm" );
+ theme = gdk_pixbuf_new_from_file("./images/default.xpm", NULL );
}
} else {
- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap,
- NULL, NULL, imagefile );
+ theme = gdk_pixbuf_new_from_file(imagefile, NULL );
}
} else {
if ( stat( imagefile, &sbuf ) != 0 ) {
@@ -495,11 +485,15 @@
"Image file not found in specified location! Exiting!\n" );
exit( 1 );
} else {
- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap,
- NULL, NULL, imagefile );
+ theme = gdk_pixbuf_new_from_file(imagefile, NULL );
}
}
-
+ surface = cairo_image_surface_create_for_data(gdk_pixbuf_get_pixels(theme),
+ CAIRO_FORMAT_RGB24,
+ gdk_pixbuf_get_width(theme),
+ gdk_pixbuf_get_height(theme),
+ gdk_pixbuf_get_rowstride(theme));
+
/* Create notebook for sensors. */
notebook = gtk_notebook_new( );
gtk_widget_modify_bg( notebook, GTK_STATE_NORMAL, &colorWhite );

9
pkgs/os-specific/linux/zfs/default.nix
View File

@@ -1,17 +1,14 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "0.6.4.1";
version = "0.6.4.2";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "zfs";
rev = "zfs-${version}";
sha256 = "15fh1b2rvzvx4j3vgkwrgy2sd553bzwcvk1zai6phjhb6i2rw8v4";
sha256 = "192x4z5am5wgrr4hb5skshyr5a6af52xpnk6pni4hs4pxvlpcs37";
};
patches = [
./nix-build.patch
./kernel-4.1-compat.patch
];
patches = [ ./nix-build.patch ];
})

6
pkgs/os-specific/linux/zfs/git.nix
View File

@@ -1,12 +1,12 @@
{ callPackage, stdenv, fetchgit, spl_git, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-06-22";
version = "2015-07-01";
src = fetchgit {
url = git://github.com/zfsonlinux/zfs.git;
rev = "72540ea3148a2bc03860d7d59b2b5fdc9a5cdee7";
sha256 = "0428xg5whr7y7r6r1jcfk8q944j948vj2nnzwgsx7cgn3n3v1yyn";
rev = "a7b10a931911d3a98a90965795daad031c6d33a2";
sha256 = "0llqbc37f4szx7mwi6j3xmxxz03g3ib7cwypmpcyi0nwkssav5xi";
};
patches = [ ./nix-build.patch ];