Skip to content

Commit

Permalink
Merge commit 'refs/top-bases/marc-nixos/minimal-install-archive' into…
Browse files Browse the repository at this point in the history 
… marc-nixos/minimal-install-archive

* commit 'refs/top-bases/marc-nixos/minimal-install-archive': (1111 commits)
  r-packages.nix: added various new libraries
  R: added wrapper script that provides "R" and "Rscript" binaries that know about extra libraries
  all-packages.nix: strip trailing whitespace
  chromium: Update all channels to latest versions.
  chromium: Link against pulse instead of dlopen().
  haskell-ghc-mod: revert "wrap the newly added ghc-modi executable"
  HTTP-4000.2.13: patch Cabal file to declare FlexibleContexts extension to fix the build with ghc-head
  haskell-httpd-shed: jailbreak to fix build with latest version of 'network'
  haskell-vinyl: add version 0.3
  haskell-graphviz: jailbreak to fix build with fgl 5.x
  haskell-ghc-mod: wrap the newly added ghc-modi executable
  haskell-download-curl: jailbreak to fix build with recent versions of tagsoup
  haskell-HTTP-4000.2.13: disable test suite to fix the build
  HTTP-4000.2.13: jailbreak to fix build with latest version of conduit
  Remove obsolete Agda-executable package; the compiler is not part of 'Agda'.
  Add several new Haskell expressions
  qwt: add version 6.x (we already have 5.x)
  pam: upstream patch to fix CVE-2014-2583
  json-c: update to 0.12, fixing CVE-2013-{6370,6371}
  happy-1.19.3: patch code to build with ghc-head
  ...

Conflicts:
	nixos/release.nix
  • Loading branch information
@MarcWeber
MarcWeber committed May 6, 2014
2 parents f42538e + 26a1763 commit 46ae6a2
Show file tree
Hide file tree
Showing 1,612 changed files with 30,895 additions and 17,690 deletions.
2 changes: 1 addition & 1 deletion .version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.04
14.10
2 changes: 1 addition & 1 deletion doc/meta.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ meta.hydraPlatforms = [];
<listitem><para>If set to <literal>true</literal>, the package is
marked as “broken”, meaning that it won’t show up in
<literal>nix-env -qa</literal>, and cannot be built or installed.
Sush packages should be removed from Nixpkgs eventually unless
Such packages should be removed from Nixpkgs eventually unless
they are fixed.</para></listitem>
</varlistentry>

Expand Down
2 changes: 1 addition & 1 deletion doc/quick-start.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>

<listitem>
<para>GNU Multiple Precision arithmetic library (GMP): <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.1.nix"><filename>pkgs/development/libraries/gmp/5.1.1.nix</filename></link>.
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>.
Also done by the generic builder, but has a dependency on
<varname>m4</varname>.</para>
</listitem>
Expand Down
24 changes: 24 additions & 0 deletions lib/licenses.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
url = https://fedoraproject.org/wiki/Licensing/BSD;
};

cc-by-30 = {
shortName = "CC BY 3.0";
fullName = "Creative Commons Attribution 3.0";
url = http://creativecommons.org/licenses/by/3.0;
};

cddl = {
shortName = "CDDL";
fullName = "Common Development Distribution License ";
Expand Down Expand Up @@ -254,4 +260,22 @@
fullName = "Sleepycat Public License";
url = "https://en.wikipedia.org/wiki/Sleepycat_License";
};

cecill-c = {
shortName = "CeCILL-C";
fullName = "CEA CNRS INRIA Logiciel Libre";
url = "http://www.cecill.info/licences.en.html";
};

msrla = {
shortName = "MSR-LA";
fullName = "Microsoft Research License Agreement";
url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
};

inria = {
shortName = "INRIA-NCLA";
fullName = "INRIA Non-Commercial License Agreement";
url = "http://compcert.inria.fr/doc/LICENSE";
};
}
1 change: 1 addition & 0 deletions lib/lists.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,5 @@ in rec {
deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;

crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];

}
7 changes: 6 additions & 1 deletion lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@
bluescreen303 = "Mathijs Kwik <[email protected]>";
bodil = "Bodil Stokke <[email protected]>";
calrama = "Moritz Maxeiner <[email protected]>";
cfouche = "Chaddaï Fouché <[email protected]>";
chaoflow = "Florian Friesdorf <[email protected]>";
coconnor = "Corey O'Connor <[email protected]>";
coroa = "Jonas Hörsch <[email protected]>";
cstrahan = "Charles Strahan <[email protected]>";
edwtjo = "Edward Tjörnhammar <[email protected]>";
eelco = "Eelco Dolstra <[email protected]>";
emery = "Emery Hemingawy <[email protected]>";
ertes = "Ertugrul Söylemez <es@ertes.de>";
ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
falsifian = "James Cook <[email protected]>";
fuuzetsu = "Mateusz Kowalczyk <[email protected]>";
garbas = "Rok Garbas <[email protected]>";
goibhniu = "Cillian de Róiste <[email protected]>";
guibert = "David Guibert <[email protected]>";
Expand All @@ -39,6 +42,7 @@
iElectric = "Domen Kozar <[email protected]>";
iyzsong = "Song Wenwu <[email protected]>";
jcumming = "Jack Cummings <[email protected]>";
jwiegley = "John Wiegley <[email protected]>";
kkallio = "Karn Kallio <[email protected]>";
ktosiek = "Tomasz Kontusz <[email protected]>";
lethalman = "Luca Bruno <[email protected]>";
Expand Down Expand Up @@ -80,6 +84,7 @@
tomberek = "Thomas Bereknyei <[email protected]>";
ttuegel = "Thomas Tuegel <[email protected]>";
urkud = "Yury G. Kudryashov <[email protected]>";
vbmithr = "Vincent Bernardoff <[email protected]>";
vcunat = "Vladimír Čunát <[email protected]>";
viric = "Lluís Batlle i Rossell <[email protected]>";
vizanto = "Danny Wilson <[email protected]>";
Expand Down
6 changes: 6 additions & 0 deletions lib/types.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,12 @@ rec {
args = { name = ""; }; }).options;
};

enum = values: mkOptionType {
name = "one of ${concatStringsSep ", " values}";
check = flip elem values;
merge = mergeOneOption;
};

# Obsolete alternative to configOf. It takes its option
# declarations from the ‘options’ attribute of containing option
# declaration.
Expand Down
1 change: 0 additions & 1 deletion maintainers/scripts/copy-tarballs.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
waitpid($pid, 0) or die;
if ($? != 0) {
print STDERR "failed to fetch $url: $?\n";
last if $? >> 8 == 255;
next;
}
<$fh>; my $storePath = <$fh>; chomp $storePath;
Expand Down
3 changes: 1 addition & 2 deletions maintainers/scripts/nixpkgs-lint.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ sub showHelp {
"maintainer|m=s" => \$maintainer,
"file|f=s" => \$path,
"help" => sub { showHelp() }
)
or die("syntax: $0 ...\n");
) or exit 1;

# Evaluate Nixpkgs into an XML representation.
my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`;
Expand Down
38 changes: 20 additions & 18 deletions nixos/doc/manual/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ postgresql.package = pkgs.postgresql90;
</section>


<section><title>Abstractions</title>
<section xml:id="sec-module-abstractions"><title>Abstractions</title>

<para>If you find yourself repeating yourself over and over, it’s time
to abstract. Take, for instance, this Apache HTTP Server configuration:
Expand Down Expand Up @@ -399,7 +399,7 @@ of an expression to be spliced into a string.</para>
</section>


<section><title>Modularity</title>
<section xml:id="sec-modularity"><title>Modularity</title>

<para>The NixOS configuration mechanism is modular. If your
<filename>configuration.nix</filename> becomes too big, you can split
Expand Down Expand Up @@ -538,7 +538,7 @@ nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
</section>


<section><title>Syntax summary</title>
<section xml:id="sec-nix-syntax-summary"><title>Syntax summary</title>

<para>Below is a summary of the most important syntactic constructs in
the Nix expression language. It’s not complete. In particular, there
Expand Down Expand Up @@ -730,7 +730,7 @@ manual</link> for the rest.</para>

<!--===============================================================-->

<section><title>Package management</title>
<section xml:id="sec-package-management"><title>Package management</title>

<para>This section describes how to add additional packages to your
system. NixOS has two distinct styles of package management:
Expand Down Expand Up @@ -935,7 +935,7 @@ environment.systemPackages = [ (import ./my-hello.nix) ];
</programlisting>
where <filename>my-hello.nix</filename> contains:
<programlisting>
with &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope

stdenv.mkDerivation rec {
name = "hello-2.8";
Expand Down Expand Up @@ -1183,7 +1183,7 @@ fileSystems."/".device = "/dev/mapper/crypted";

<!--===============================================================-->

<section><title>X Window System</title>
<section xml:id="sec-x11"><title>X Window System</title>

<para>The X Window System (X11) provides the basis of NixOS’ graphical
user interface. It can be enabled as follows:
Expand All @@ -1195,7 +1195,7 @@ driver from a set of X.org drivers (such as <literal>vesa</literal>
and <literal>intel</literal>). You can also specify a driver
manually, e.g.
<programlisting>
hardware.opengl.videoDrivers = [ "r128" ];
services.xserver.videoDrivers = [ "r128" ];
</programlisting>
to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>

Expand Down Expand Up @@ -1238,7 +1238,7 @@ $ systemctl start display-manager.service
has better 3D performance than the X.org drivers. It is not enabled
by default because it’s not free software. You can enable it as follows:
<programlisting>
hardware.opengl.videoDrivers = [ "nvidia" ];
services.xserver.videoDrivers = [ "nvidia" ];
</programlisting>
You may need to reboot after enabling this driver to prevent a clash
with other kernel modules.</para>
Expand Down Expand Up @@ -1275,9 +1275,9 @@ services.xserver.synaptics.twoFingerScroll = true;

<!--===============================================================-->

<section><title>Networking</title>
<section xml:id="sec-networking"><title>Networking</title>

<section><title>Secure shell access</title>
<section xml:id="sec-ssh"><title>Secure shell access</title>

<para>Secure shell (SSH) access to your machine can be enabled by
setting:
Expand Down Expand Up @@ -1305,7 +1305,7 @@ users.extraUsers.alice.openssh.authorizedKeys.keys =
</section>


<section><title>IPv4 configuration</title>
<section xml:id="sec-ipv4"><title>IPv4 configuration</title>

<para>By default, NixOS uses DHCP (specifically,
<command>dhcpcd</command>) to automatically configure network
Expand Down Expand Up @@ -1348,7 +1348,7 @@ provide the host name.</para>
</section>


<section><title>IPv6 configuration</title>
<section xml:id="sec-ipv6"><title>IPv6 configuration</title>

<para>IPv6 is enabled by default. Stateless address autoconfiguration
is used to automatically assign IPv6 addresses to all interfaces. You
Expand All @@ -1363,17 +1363,19 @@ networking.enableIPv6 = false;
</section>


<section><title>Firewall</title>
<section xml:id="sec-firewall"><title>Firewall</title>

<para>NixOS has a simple stateful firewall that blocks incoming
connections and other unexpected packets. The firewall applies to
both IPv4 and IPv6 traffic. It can be enabled as follows:
both IPv4 and IPv6 traffic. It is enabled by default. It can be
disabled as follows:

<programlisting>
networking.firewall.enable = true;
networking.firewall.enable = false;
</programlisting>

You can open specific TCP ports to the outside world:
If the firewall is enabled, you can open specific TCP ports to the
outside world:

<programlisting>
networking.firewall.allowedTCPPorts = [ 80 443 ];
Expand All @@ -1395,7 +1397,7 @@ always allowed.)</para>
</section>


<section><title>Wireless networks</title>
<section xml:id="sec-wireless"><title>Wireless networks</title>

<para>
NixOS will start wpa_supplicant for you if you enable this setting:
Expand Down Expand Up @@ -1456,7 +1458,7 @@ networking.localCommands =

<!--===============================================================-->

<section><title>Linux kernel</title>
<section xml:id="sec-kernel-config"><title>Linux kernel</title>

<para>You can override the Linux kernel and associated packages using
the option <option>boot.kernelPackages</option>. For instance, this
Expand Down
Loading

0 comments on commit 46ae6a2

Please sign in to comment.