diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/tools/filesystems/nixpart | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
download | nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/tools/filesystems/nixpart')
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/pyblock.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 2ce126d7169f..3ed145c82f2d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { name = "pyblock-${version}"; version = "0.53"; + md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; - md5 = "f6d33a8362dee358517d0a9e2ebdd044"; + + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; postPatch = '' diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 86479126d393..f13ad14aded8 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -3,11 +3,12 @@ buildPythonApplication rec { name = "pykickstart-${version}"; version = "1.99.39"; + md5_path = "d249f60aa89b1b4facd63f776925116d"; src = fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" - + "${name}.tar.gz/${md5}/${name}.tar.gz"; - md5 = "d249f60aa89b1b4facd63f776925116d"; + + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; + sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; postPatch = '' |