diff options
| author | Leo Famulari <leo@famulari.name> | 2016-11-02 20:03:35 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-11-02 20:03:35 -0400 |
| commit | b3cc0dce089917b1935218296f868ab6eedff5ed (patch) | |
| tree | 984a26076026d2b588f6c34a1526d792ea3a052f /guix | |
| parent | 40330e555f2548d738fbcfac6fa5d80ab1bb2eb2 (diff) | |
| parent | e681e347c4ed071db88442c2c592241ea0f43857 (diff) | |
| download | gnu-guix-b3cc0dce089917b1935218296f868ab6eedff5ed.tar gnu-guix-b3cc0dce089917b1935218296f868ab6eedff5ed.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/download.scm | 2 | ||||
| -rw-r--r-- | guix/licenses.scm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/guix/download.scm b/guix/download.scm index 649e96b51b..80507f952a 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -87,6 +87,8 @@ "http://ftp.linux.org.uk/mirrors/ftp.gnome.org/" "http://ftp.gnome.org/pub/GNOME/" "http://mirror.yandex.ru/mirrors/ftp.gnome.org/") + (hackage + "http://hackage.haskell.org/") (savannah "http://download.savannah.gnu.org/releases/" "ftp://ftp.twaren.net/Unix/NonGNU/" diff --git a/guix/licenses.scm b/guix/licenses.scm index ff214cf957..1e19300586 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -48,7 +48,7 @@ giftware gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+ gfl1.0 - fdl1.1+ fdl1.3+ + fdl1.1+ fdl1.2+ fdl1.3+ opl1.0+ isc ijg |