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-11-05 18:30:11 -08:00
parent 974dd8012d ddbb174bb0
commit 1e7aa4f17d
23 changed files with 125 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/bluez/bluez5.nix
+2 -2
View File
@@ -5,11 +5,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "bluez-5.35";
name = "bluez-5.36";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
sha256 = "1qphz25hganfnd5ipfscbj7s70anv5favmwqmi9ig2saciaf1zhs";
sha256 = "1wkqwmi5krr37mxcqqlp5m2xnw7vw70v3ww7j09vvlskxcdflhx3";
};
pythonPath = with pythonPackages;
pkgs/os-specific/linux/cryptsetup/default.nix
+3 -3
View File
@@ -5,11 +5,11 @@
assert enablePython -> python != null;
stdenv.mkDerivation rec {
name = "cryptsetup-1.6.7";
name = "cryptsetup-1.7.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v1.6/${name}.tar.xz";
sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62";
url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
sha256 = "0j6iwf64pdrl4nm5ypc2r33b3k0aflb939wz2496vcqdrjkj8m87";
};
configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]