diff --git a/doc/language-support.xml b/doc/language-support.xml index f5e89df57fc..117e1d93c15 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -233,6 +233,17 @@ twisted = buildPythonPackage { +
Ruby + For example, to package yajl-ruby package, use gem-nix: + + + $ nix-env -i gem-nix + $ gem-nix --no-user-install --nix-file=pkgs/development/interpreters/ruby/generated.nix yajl-ruby + $ nix-build -A rubyLibs.yajl-ruby + +
+ +
Java Ant-based Java packages are typically built from source as follows: diff --git a/lib/licenses.nix b/lib/licenses.nix index caffa7539d1..dadb9b07a08 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -72,6 +72,11 @@ rec { fullName = "Creative Commons Attribution 3.0"; }; + cc-by-40 = spdx { + shortName = "CC-BY-4.0"; + fullName = "Creative Commons Attribution 4.0"; + }; + cddl = spdx { shortName = "CDDL-1.0"; fullName = "Common Development and Distribution License 1.0"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c52b6638039..1124d75d52a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -41,6 +41,7 @@ cstrahan = "Charles Strahan "; DamienCassou = "Damien Cassou "; DerGuteMoritz = "Moritz Heidkamp "; + dbohdan = "Danyil Bohdan "; doublec = "Chris Double "; ederoyd46 = "Matthew Brown "; edwtjo = "Edward Tjörnhammar "; @@ -118,6 +119,7 @@ ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; urkud = "Yury G. Kudryashov "; + vandenoever = "Jos van den Oever "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; viric = "Lluís Batlle i Rossell "; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index bd89ad4eb9c..68248081af6 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -57,7 +57,7 @@ let }; optionsDocBook = runCommand "options-db.xml" {} '' - optionsXML=${options'}/doc/share/nixos/options.xml + optionsXML=${options'}/share/doc/nixos/options.xml if grep /nixpkgs/nixos/modules $optionsXML; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" echo "since this prevents sharing via the NixOS channel. This is typically" @@ -127,7 +127,7 @@ in rec { mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products - echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dst" >> $out/nix-support/hydra-build-products ''; # */ meta.description = "The NixOS manual in HTML format"; diff --git a/nixos/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl index ce8a9c6de2b..0485412b4c8 100644 --- a/nixos/lib/test-driver/log2html.xsl +++ b/nixos/lib/test-driver/log2html.xsl @@ -9,8 +9,8 @@ - - + +