diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
| commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
| tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/os-specific/linux | |
| parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
| parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
| download | nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.zip | |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/fswebcam/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix new file mode 100644 index 000000000000..fa0797bf7a3c --- /dev/null +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libv4l, gd }: + +stdenv.mkDerivation rec { + name = "fswebcam-20140113"; + + src = fetchurl { + url = "http://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199"; + }; + + buildInputs = + [ libv4l gd ]; + + meta = { + description = "neat and simple webcam app"; + homepage = http://www.sanslogic.co.uk/fswebcam; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 09cdcbf8a241..2db3a397aebe 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -17,13 +17,13 @@ assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.5"; + version = "0.6.5.6"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "1f49qv648klg2sn1v1wzwd6ls1njjj0hrazz7msd74ayhwm0zcw7"; + sha256 = "08lbfwsd368sk7dgydabzkyyn2l2n82ifcqakra3xknwgg1ka9bn"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d29a7560771e..9fc28996a834 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null; stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.5"; + version = "0.6.5.6"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "0np03p5zkx87a0a5rw629f9m4wp5gd01c1jkh5p7h63mmvaxfdda"; + sha256 = "0lsb93y5zbwc8fafxzm9vyfpr6fmvl8h86ny4llbd2xy2hnfwk2i"; }; patches = [ ./nix-build.patch ]; |