summaryrefslogtreecommitdiff
path: root/hurd/running
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-03-09 23:17:21 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-03-09 23:17:21 +0100
commit7a45cd11f532194ac60fbc49ec5fe72f1476ecfe (patch)
tree5bf90c06c32830cc7ecd0ed0cfab49eae71178b6 /hurd/running
parent90a5e3033b3aa800e31e21fb2ac3d944d806df82 (diff)
parent4f6e25bae59835cb402597fc82a8029f6d56a3c9 (diff)
Merge branch 'master' of braunbox:~hurd-web/hurd-web
Diffstat (limited to 'hurd/running')
-rw-r--r--hurd/running/nix.mdwn9
1 files changed, 7 insertions, 2 deletions
diff --git a/hurd/running/nix.mdwn b/hurd/running/nix.mdwn
index b77404a4..66824cf0 100644
--- a/hurd/running/nix.mdwn
+++ b/hurd/running/nix.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2012, 2013, 2014 Free Software Foundation,
+[[!meta copyright="Copyright © 2012, 2013, 2014, 2016 Free Software Foundation,
Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -11,7 +11,7 @@ License|/fdl]]."]]"""]]
[[!meta title="Nix-based GNU/Hurd System, Guix"]]
-[[!toc]]
+[[!toc levels=2]]
# Nix
@@ -510,3 +510,8 @@ Nix, and because of that, it uses per-package installation directories under
<ph4n70m4s> Any idea why is this happening?
<braunr> ph4n70m4s: something is trying to compile as an x86-64 object,
while the hurd is i386 only
+
+
+## FOSDEM 2016
+
+ * {{$community/meetings/fosdem_2016#ragkousis_guix_hurd}}