diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-01-19 23:59:20 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-01-19 23:59:20 -0500 |
| commit | e074a655dd6497daafbd62737e3b63f3d5aa7985 (patch) | |
| tree | 2b198ba5c664cdd58e155f3c0113d1cebde0fc91 /guix/packages.scm | |
| parent | 6d7b26a39faf42c37f15dc64a30a77e5e194ea23 (diff) | |
| parent | ccb5cac17be98aaa9c3225605d6170c675d8e8e6 (diff) | |
| download | gnu-guix-e074a655dd6497daafbd62737e3b63f3d5aa7985.tar gnu-guix-e074a655dd6497daafbd62737e3b63f3d5aa7985.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/packages.scm')
| -rw-r--r-- | guix/packages.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index be0a5eeedb..b5c0b60440 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> @@ -789,7 +789,8 @@ when CUT? returns true for a given package." (location (package-location p)) (inputs (map rewrite (package-inputs p))) (native-inputs (map rewrite (package-native-inputs p))) - (propagated-inputs (map rewrite (package-propagated-inputs p))))))) + (propagated-inputs (map rewrite (package-propagated-inputs p))) + (replacement (and=> (package-replacement p) proc)))))) replace) |