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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Aycan iRiCAN 2014-06-26 23:50:18 +03:00
commit 0acf2f98b7
18 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules.nix
View File

@ -194,7 +194,7 @@ rec {
is transformed into is transformed into
[ { boot = set1; } { boot = mkIf cond set2; services mkIf cond set3; } ]. [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ].
This transform is the critical step that allows mkIf conditions This transform is the critical step that allows mkIf conditions
to refer to the full configuration without creating an infinite to refer to the full configuration without creating an infinite

1
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -56,7 +56,6 @@ let
authKeysFiles = let authKeysFiles = let
mkAuthKeyFile = u: { mkAuthKeyFile = u: {
target = "ssh/authorized_keys.d/${u.name}"; target = "ssh/authorized_keys.d/${u.name}";
mode = "0444";
source = pkgs.writeText "${u.name}-authorized_keys" '' source = pkgs.writeText "${u.name}-authorized_keys" ''
${concatStringsSep "\n" u.openssh.authorizedKeys.keys} ${concatStringsSep "\n" u.openssh.authorizedKeys.keys}
${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles}

19
pkgs/applications/networking/instant-messengers/skype/default.nix
View File

@ -1,20 +1,18 @@
{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib { stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
, pulseaudio, usePulseAudio, lib }: , pulseaudio, lib, ... }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "skype-4.2.0.13"; name = "skype-4.3.0.37";
src = fetchurl { src = fetchurl {
url = "http://download.skype.com/linux/${name}.tar.bz2"; url = "http://download.skype.com/linux/${name}.tar.bz2";
sha256 = "137kp6c0v4z7n7pp4hwrx4gjgk4knwj815dc6swh44lb5cj1c5m5"; sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";
}; };
buildInputs = buildInputs = [
lib.optional usePulseAudio pulseaudio ++ [
alsaLib
stdenv.glibc stdenv.glibc
stdenv.gcc.gcc stdenv.gcc.gcc
libXv libXv
@ -27,6 +25,7 @@ stdenv.mkDerivation rec {
libXi libXi
libXrender libXrender
libXrandr libXrandr
pulseaudio
freetype freetype
fontconfig fontconfig
zlib zlib
@ -44,13 +43,13 @@ stdenv.mkDerivation rec {
fullPath=$fullPath''${fullPath:+:}$i/lib fullPath=$fullPath''${fullPath:+:}$i/lib
done done
dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$fullPath" $out/libexec/skype/skype
cat > $out/bin/skype << EOF cat > $out/bin/skype << EOF
#!${stdenv.shell} #!${stdenv.shell}
export PULSE_LATENCY_MSEC=60 # workaround for pulseaudio glitches export PULSE_LATENCY_MSEC=60 # workaround for pulseaudio glitches
export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
$dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
EOF EOF
chmod +x $out/bin/skype chmod +x $out/bin/skype

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -10,7 +10,7 @@
let let
version = "1.9.4"; version = "2.0.1";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1shxa49lsxn81qpfi60wh7rn5ci4zjgljvr0qczdmnqzd8w1zyvb"; sha256 = "1pylqr2qzndy92x3pq8hkwsb3garww2jxb167s6hshrva81s24mb";
}; };
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];

4
pkgs/development/libraries/haskell/bson/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "bson"; pname = "bson";
version = "0.2.4"; version = "0.3";
sha256 = "1fr0xx9q2l3cb72j5lgrwdlr2gba7idh2v80s8d6dr69dhwaccd9"; sha256 = "0787z6970lf93mgrsyqcilnkx5bynny88ag15z2f07l1rhva6ac4";
buildDepends = [ buildDepends = [
binary cryptohash dataBinaryIeee754 mtl network text time binary cryptohash dataBinaryIeee754 mtl network text time
]; ];

2
pkgs/development/libraries/haskell/extensible-effects/default.nix
View File

@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
HUnit QuickCheck testFramework testFrameworkHunit HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 testFrameworkQuickcheck2
]; ];
jailbreak = true;
meta = { meta = {
homepage = "https://github.com/RobotGymnast/extensible-effects"; homepage = "https://github.com/RobotGymnast/extensible-effects";
description = "An Alternative to Monad Transformers"; description = "An Alternative to Monad Transformers";
@ -18,5 +19,4 @@ cabal.mkDerivation (self: {
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ]; maintainers = [ self.stdenv.lib.maintainers.ocharles ];
}; };
jailbreak = true;
}) })

23
pkgs/development/libraries/haskell/folds/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ cabal, comonad, contravariant, deepseq, doctest, filepath, hlint
, lens, mtl, pointed, profunctors, reflection, semigroupoids
, semigroups, tagged, transformers, vector
}:
cabal.mkDerivation (self: {
pname = "folds";
version = "0.6.1";
sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1";
buildDepends = [
comonad contravariant lens pointed profunctors reflection
semigroupoids tagged transformers vector
];
testDepends = [ deepseq doctest filepath hlint mtl semigroups ];
# The hlint tests presently fail
doCheck = false;
meta = {
homepage = "http://github.com/ekmett/folds";
description = "Beautiful Folding";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/hcltest/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hcltest"; pname = "hcltest";
version = "0.3.1"; version = "0.3.2";
sha256 = "0qnf6ib01njcbjfbwxff8y4sqmrj6nyy9y9hb0l0kw21cxsgl7c9"; sha256 = "0q5b0v2gh0b3a15hg25bqj7scbckrkka2ckk49g2mrdz2gpr28bq";
buildDepends = [ buildDepends = [
dlist either filepath free lens mmorph monadControl mtl dlist either filepath free lens mmorph monadControl mtl
optparseApplicative randomShuffle split stm tagged tasty temporary optparseApplicative randomShuffle split stm tagged tasty temporary

4
pkgs/development/libraries/haskell/mongoDB/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "mongoDB"; pname = "mongoDB";
version = "1.5.0"; version = "2.0";
sha256 = "0dvy8pa79c26hcngds6nnwnayrhsyz1flj18m9bcyrcvwb5q3dd6"; sha256 = "1dspx1x20903i44i825ziwmvaax75m8g08kz97cv34077bdir80h";
buildDepends = [ buildDepends = [
binary bson cryptohash hashtables liftedBase monadControl mtl binary bson cryptohash hashtables liftedBase monadControl mtl
network parsec random randomShuffle text transformersBase network parsec random randomShuffle text transformersBase

3
pkgs/development/libraries/haskell/pipes-bytestring/default.nix
View File

@ -1,5 +1,4 @@
{ cabal, pipes, pipesGroup, pipesParse, transformers { cabal, pipes, pipesGroup, pipesParse, transformers }:
}:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "pipes-bytestring"; pname = "pipes-bytestring";

4
pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "quickcheck-property-monad"; pname = "quickcheck-property-monad";
version = "0.2.1"; version = "0.2.2";
sha256 = "1ln8bcsc8hd8jyhd9rp2j90p5h5nhmwidb5my91p09h43y4z9xds"; sha256 = "1liixl4xxpx9f3877sss16m67y5bkwhxdmr8h40rpqdi7dz9s0mj";
buildDepends = [ either QuickCheck transformers ]; buildDepends = [ either QuickCheck transformers ];
testDepends = [ doctest filepath QuickCheck ]; testDepends = [ doctest filepath QuickCheck ];
meta = { meta = {

4
pkgs/development/libraries/haskell/simple-sendfile/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "simple-sendfile"; pname = "simple-sendfile";
version = "0.2.14"; version = "0.2.15";
sha256 = "00k9cachx7y4811b71f8p468kx018hzvpvw6jgf7zmjhc9v922ni"; sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9";
buildDepends = [ network resourcet ]; buildDepends = [ network resourcet ];
testDepends = [ testDepends = [
conduit conduitExtra hspec HUnit network networkConduit resourcet conduit conduitExtra hspec HUnit network networkConduit resourcet

4
pkgs/development/libraries/haskell/unix-compat/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "unix-compat"; pname = "unix-compat";
version = "0.4.1.1"; version = "0.4.1.3";
sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf"; sha256 = "1vfw3ffzdk9mshhgyp3dnbn8rihkz8qg6n5zqak8966dsdqhm4xb";
meta = { meta = {
homepage = "http://github.com/jystic/unix-compat"; homepage = "http://github.com/jystic/unix-compat";
description = "Portable POSIX-compatibility layer"; description = "Portable POSIX-compatibility layer";

4
pkgs/os-specific/linux/kernel/linux-3.12.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args: { stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "3.12.22"; version = "3.12.23";
extraMeta.branch = "3.12"; extraMeta.branch = "3.12";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0c9rw11iihjimqb6mdmwn4q67ds7jg4qibj5ijj5pdmkdqzj7g54"; sha256 = "0aa9vnyk4p6hg4fp4rm4a95cn4p16j2dfrhc3cfznpcdkpi5q9m7";
}; };
features.iwlwifi = true; features.iwlwifi = true;

17
pkgs/os-specific/linux/kernel/linux-3.13.nix
View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.13.11";
extraMeta.branch = "3.13";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1nhi5m0nnrb7v2gqpa3181p32k5hm5jwkf647vs80r14750gxlpw";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

6
pkgs/servers/samba/default.nix
View File

@ -18,11 +18,11 @@
assert useKerberos -> kerberos != null; assert useKerberos -> kerberos != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "samba-3.6.22"; name = "samba-3.6.24";
src = fetchurl { src = fetchurl {
url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; url = "http://samba.org/samba/ftp/stable/${name}.tar.gz";
sha256 = "1sny3irf1p4fjli5qa29swr3l217grg90cva35rmay48fw7g5g9h"; sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i";
}; };
buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]

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

@ -7238,15 +7238,6 @@ let
]; ];
}; };
linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) {
inherit fetchurl stdenv perl buildLinux; inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@ -7411,7 +7402,6 @@ let
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
@ -9448,9 +9438,7 @@ let
siproxd = callPackage ../applications/networking/siproxd { }; siproxd = callPackage ../applications/networking/siproxd { };
skype = callPackage_i686 ../applications/networking/instant-messengers/skype { skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
usePulseAudio = config.pulseaudio or true;
};
skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };

2
pkgs/top-level/haskell-packages.nix
View File

@ -799,6 +799,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
foldl = callPackage ../development/libraries/haskell/foldl {}; foldl = callPackage ../development/libraries/haskell/foldl {};
folds = callPackage ../development/libraries/haskell/folds {};
forceLayout = callPackage ../development/libraries/haskell/force-layout {}; forceLayout = callPackage ../development/libraries/haskell/force-layout {};
free = callPackage ../development/libraries/haskell/free {}; free = callPackage ../development/libraries/haskell/free {};