diff options
-rw-r--r-- | nixos/modules/services/networking/ddclient.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/3.5/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/backup/partclone/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 4 |
6 files changed, 18 insertions, 17 deletions
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5802d8b95b3..ee06dfbbca3 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -18,7 +18,7 @@ let password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} server=${config.services.ddclient.server} - ssl=${if config.services.ddclient.ssl then "yes" else "yes"} + ssl=${if config.services.ddclient.ssl then "yes" else "no"} wildcard=YES ${config.services.ddclient.domain} ${config.services.ddclient.extraConfig} diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index f624bd5d85e..a2c059da060 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -22,11 +22,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.10"; + version = "${majorVersion}.11"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw"; + sha256 = "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn"; }; patches = diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 2d85a52a2e9..0f4b6e744ac 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -23,7 +23,7 @@ with stdenv.lib; let majorVersion = "3.5"; pythonVersion = majorVersion; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -39,7 +39,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn"; + sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a9cb410487..5006f0519eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4-rc3"; - modDirVersion = "4.4.0-rc3"; + version = "4.4-rc4"; + modDirVersion = "4.4.0-rc4"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1c45bjclz5y039nqwrfil8yzv108r6vvbjfrq7dpz64iyf7iqnv4"; + sha256 = "040ddm61rifscssnycd1lq9bfni3yrsdrrgg172rb9h5d7ya6981"; }; features.iwlwifi = true; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 928c0494a1c..9aea0c80c6f 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,18 +1,19 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub , pkgconfig, libuuid -, e2fsprogs +, e2fsprogs, automake, autoconf }: stdenv.mkDerivation { name = "partclone-stable"; enableParallelBuilding = true; - src = fetchurl { - url = https://codeload.github.com/Thomas-Tsai/partclone/legacy.tar.gz/stable; - sha256 = "12bnhljc4n4951p5c05gc7z5qwdsjpx867ad1npmgsm8d9w941sn"; - name = "Thomas-Tsai-partclone-stable-20150722.tar.gz"; + src = fetchFromGitHub { + owner = "Thomas-Tsai"; + repo = "partclone"; + rev = "stable"; + sha256 = "0q3brjmnldpr89nhbiajxg3gncz0nagc34n7q2723lpz7bn28w3z"; }; - buildInputs = [e2fsprogs pkgconfig libuuid]; + buildInputs = [e2fsprogs pkgconfig libuuid automake autoconf]; installPhase = ''make INSTPREFIX=$out install''; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 5b439eb8f3f..0829fed1d5e 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { - name = "i2p-0.9.22"; + name = "i2p-0.9.23"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0y21dx5d95gq1i6ip56nmawr19974zawzwa315dm8lmz32bj8g6n"; + sha256 = "1vjyki86r6v8z2pil7s6r74yf6h8w000ypxxngimw3kfff121swp"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; |