Commit graph

295 commits

Author SHA1 Message Date
Andreas Rammhold
44ce4cb6d3
Merge branch 'master' into binutils 2018-08-23 00:28:37 +02:00
Graham Christensen
49a4e93ce3
Merge pull request #80 from acowley/darwin-sidebar
Nix on darwin note: use a `<note>` element
2018-08-20 22:18:19 -04:00
Anthony Cowley
4f372ebaf3 Nix on darwin note: use a <note> element
This takes advantage of existing styling support.
2018-08-20 21:46:52 -04:00
Graham Christensen
5520e97546
Merge pull request #79 from acowley/darwin-sidebar
Add a note on adapting content for darwin
2018-08-20 21:07:04 -04:00
Anthony Cowley
5626a121ec Add a note on adapting content for darwin 2018-08-20 20:56:01 -04:00
Jörg Thalheim
33d151066f fix binutils input in hello-builder
fixes #76
2018-08-20 10:20:47 +01:00
Jörg Thalheim
cac959638b
Merge pull request #72 from rolfschr/master
Pill 07: Make the input file name explicit.
2018-06-18 10:53:37 +01:00
Rolf Schröder
3fecf6007e Pill 07: Make the input file name explicit. 2018-06-18 09:10:31 +02:00
Jörg Thalheim
219f9f09d9
Merge pull request #69 from jsamsa/master
may -> must as attribute is required to avoid ambiguity
2018-04-27 17:41:14 +01:00
Jason Samsa
64653e731d
may -> must as attribute is required to avoid ambiguity 2018-04-27 11:28:57 -05:00
Jörg Thalheim
e9f5967d50
Merge pull request #67 from dudebout/pill-20-buildable
Make pill 20 buildable
2018-04-27 10:45:39 +01:00
Nicolas Dudebout
b706fc958b pill 20: make it buildable
+ refer to the old nixpkgs commit in a note but use the current nixpkgs for the
  actual examples
+ add which to the PATH
+ add `unpackPhase = "true";` to satisfy stdenv requirements
+ explain how _PATH and PATH are related
2018-04-12 07:38:14 -04:00
Nicolas Dudebout
5a07abc2b9 pill 20: fix a few typos
+ add a few missing words
+ pick the lowercase spelling for `stdenv` and use it consistenly
+ reword a sentence that I had a hard time understanding
+ fix the path of the second nix expression to be included
2018-04-12 07:02:11 -04:00
John Ericson
3b4f4edbbf Update README.md
Add headings and link to deployed version

Fix #54
2018-04-11 18:46:42 -04:00
John Ericson
e5534d4641 Redefine mul to disambiguate
It's not immediately obvious which previous `mul` definition applies,
and is a copy-paste hazard. Staring the block with a `mul = ...` is also
consistent with the other code blocks.

Fixes #46
2018-04-11 18:18:31 -04:00
Jakob Brünker
959526f5f8 change pill 04 to reflect that floating point number now exist 2018-04-11 17:54:54 -04:00
Nicolas Dudebout
4bdce7aa10 fix import issues in pill 20 2018-04-08 23:02:55 -04:00
Nicolas Dudebout
a3c3d6d889 fix rename mistake in 02de506 2018-04-08 22:56:34 -04:00
Nicolas Dudebout
3bfd7caf67 fix last pp-aterm instance
The "pp-aterm" was missed while porting this pill from blogpost.com.
2018-04-08 20:48:44 -04:00
Nicolas Dudebout
4360bbcf3a fix mispelling of graphviz 2018-04-07 21:18:30 -04:00
Nicolas Dudebout
02de50625b replace indent with nix show-derivation 2018-04-06 23:30:28 -04:00
John Ericson
6a6a23a6d6
Merge pull request #55 from Mic92/indent
replace non-longer present pp-aterm with indent
2018-03-31 13:27:12 -04:00
Jörg Thalheim
8a968c8590 replace non-longer present pp-aterm with indent
fixes #53
2018-03-31 17:00:18 +01:00
Jörg Thalheim
55f46cd51d
Merge pull request #48 from mwu/master
Minor typos
2018-03-09 17:32:43 +00:00
Jörg Thalheim
482a10b215
Merge branch 'master' into master 2018-03-09 17:06:37 +00:00
John Ericson
9bdd66dd6d
Merge pull request #49 from obsidiansystems/pill-20
Pill 20: Init according 19's teaser
2018-03-09 11:57:35 -05:00
John Ericson
4c513daccd Pill 20: Init according 19's teaser 2018-02-23 19:04:13 -05:00
John Ericson
aca2170ce0 Pill 19: Clean up working a 2018-02-23 19:04:13 -05:00
John Ericson
4de6aaea5d Allow *.nix just within subdirectories 2018-02-23 19:04:13 -05:00
Myron Wu
75e7611b16 Minor typos 2018-02-18 14:55:33 -08:00
Graham Christensen
2730aa3909
Merge pull request #44 from jackjennings/patch-1
Add missing space in recursive attributes example
2018-01-28 08:05:52 -05:00
Graham Christensen
34e93e7f55
Merge pull request #45 from jackjennings/patch-2
Fix typo in "Basics of Language" chapter
2018-01-28 08:05:40 -05:00
Jack Jennings
eca0972884
Fix typo in "Basics of Language" chapter 2018-01-27 22:18:38 -08:00
Jack Jennings
85087680f6
Add missing space in recursive attributes example 2018-01-27 22:11:28 -08:00
Graham Christensen
c5abff6df4
Merge pull request #30 from michaelpj/imp/pills-2
Pills 2-4: edit for style and clarity
2017-12-30 18:37:11 -05:00
Graham Christensen
a3ee4ec631
Merge branch 'master' into imp/pills-2 2017-12-30 18:35:41 -05:00
Graham Christensen
436ce8445d
Merge branch 'master' into imp/pills-2 2017-12-30 18:35:03 -05:00
Graham Christensen
cad67023d7
Merge pull request #41 from willprice/fix-pill-8-gnu-hello-missing-ar
Pill 8: Fix missing ar binary in build environment
2017-12-30 18:23:40 -05:00
Graham Christensen
88406cd63b
Merge branch 'master' into fix-pill-8-gnu-hello-missing-ar 2017-12-30 18:21:47 -05:00
Graham Christensen
680975e605
Merge branch 'master' into fix-pill-8-gnu-hello-missing-ar 2017-12-29 06:52:50 -05:00
Graham Christensen
bf274e79d6
Merge pull request #39 from willprice/master
Pill 12: Add missing graphviz sources link
2017-12-29 06:51:48 -05:00
Graham Christensen
f8ac73bc3b
Merge pull request #38 from balajirrao/patch-1
Update 02-install-on-your-running.xml
2017-12-29 06:49:58 -05:00
Graham Christensen
9a3f6197c4
Merge pull request #37 from lezed1/master
Update GNU Hello version to 2.10
2017-12-29 06:39:55 -05:00
Will Price
ac90b5cce8
Fix missing ar in build environment 2017-12-28 14:24:41 +00:00
Will Price
167c68ebd2
Add missing graphviz sources link 2017-12-28 10:48:01 +00:00
Balaji Rao
8a6a5367c2
Update 02-install-on-your-running.xml
add missing quote
2017-12-21 05:40:54 +01:00
Graham Christensen
89e5624b55
License it CC-BY-SA-4.0 per #36 where every existing contributor agreed
ankhers: I'm okay with that.
lheckemann: I'm fine with it. Are we now going to get github notifications for each person agreeing? >_>
frontsideair: I'm also okay.
ecnerwala: I'm fine with it.
disassembler: I can't check the box, but I'm cool with it, also responded in IRC earlier.
richardipsum: I'm fine with it
ixxie: Im fine with it!
Munksgaard: Sounds great, go ahead :-)
qrilka: I'm fine with it
vaibhavsagar: Fine by me 😃!
michaelpj: Fine by me.
gfixler: Sounds good to me.
efx: I approve. Good call on licensing before any patent battles.
Anton-Latukha: Sure. I agree.

From: Luca Bruno
Date: Sat, 16 Dec 2017 10:30:02 +0000
Subject: Re: License for Nix Pills?
To: Daniel Peebles
Cc: Graham Christensen

I see, that sounds great. I don't have any opinion on the license, just
pick whatever you think is best :)

2017-12-14 17:49 GMT+00:00 Daniel Peebles:

> We're looking at solidifying the NixOS foundation's legal standing [...]
> and as part of that are digging up licenses for various components that we
> host, including code, documentation and the pills.
>
>
> On Thu, Dec 14, 2017 at 12:48 PM, Luca Bruno
> wrote:
>
>> What's the need for a license at all?
>>
>> 2017-12-14 17:43 GMT+00:00 Daniel Peebles:
>>
>>> Thanks, that's very generous!
>>>
>>> May I suggest Creative Commons BY? See https://creativecommons.or
>>> g/licenses/
>>>
>>>>
>>>> CC BY
>>>> This license lets others distribute, remix, tweak, and build upon your
>>>> work, even commercially, as long as they credit you for the original
>>>> creation. This is the most accommodating of licenses offered. Recommended
>>>> for maximum dissemination and use of licensed materials.
>>>
>>>
>>> Otherwise, CC BY-SA would force downstream users to continue to license
>>> it under similar terms, if you'd prefer.
>>>
>>>
>>> On Thu, Dec 14, 2017 at 12:39 PM, Luca Bruno
>>> wrote:
>>>
>>>> Uhm don't know :) They are there open for everyone to use and modify I
>>>> guess :)
>>>>
>>>> 2017-12-14 16:30 GMT+00:00 Daniel Peebles:
>>>>
>>>>> Hi Luca,
>>>>>
>>>>> Since your wonderful Nix pills have been migrated to the Nix docs
>>>>> site, I was wondering what license you wrote the originals under. Do you
>>>>> have any opinions on that?
>>>>>
>>>>> Thank you,
>>>>> Dan
>>>>>
2017-12-19 07:04:41 -05:00
Zander Bolgar
28a3c1d93a Update GNU Hello version to 2.10 in rest of pills 2017-12-19 04:47:21 -05:00
Zander Bolgar
116ea8fae5 Update GNU Hello version to 2.10 2017-12-19 04:26:58 -05:00
Graham Christensen
9879a2e8bc
Merge pull request #34 from qrilka/patch-1
Missed space
2017-12-05 21:43:33 -05:00