Skip to content

Commit

Permalink
Merge pull request NixOS#5 from basvandijk/update
Browse files Browse the repository at this point in the history 
Merge upstream master
  • Loading branch information
ryantrinkle committed Dec 5, 2014
2 parents 21566e7 + 3b25e23 commit 85a4f28
Show file tree
Hide file tree
Showing 3,071 changed files with 76,219 additions and 48,945 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 3 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
language: python
python: "3.4"
script: ./maintainers/scripts/travis-nox-review-pr.sh
before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix
install: ./maintainers/scripts/travis-nox-review-pr.sh nox
script: ./maintainers/scripts/travis-nox-review-pr.sh build
2 changes: 1 addition & 1 deletion .version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.10
14.11
4 changes: 1 addition & 3 deletions doc/contributing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

<listitem><para><command>$ git clone git://github.com/NixOS/nixpkgs.git</command></para></listitem>

<listitem><para><command>$ cd nixpkgs/pkgs/top-level</command></para></listitem>

<listitem><para><command>$ nix-build -A tarball release.nix</command></para></listitem>
<listitem><para><command>$ nix-build -A manual nixpkgs/pkgs/top-level/release.nix</command></para></listitem>

<listitem><para>Inside the built derivation you shall see <literal>manual/index.html</literal> file.</para></listitem>

Expand Down
Loading

0 comments on commit 85a4f28

Please sign in to comment.