diff --git a/doc/Makefile b/doc/Makefile index 952ef4bfcbb9..8a4612e95f19 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,12 +1,17 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md))) .PHONY: all -all: validate out/html/index.html out/epub/manual.epub +all: validate format out/html/index.html out/epub/manual.epub .PHONY: debug debug: nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" +.PHONY: format +format: + find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {} + .PHONY: clean clean: rm -f ${MD_TARGETS} .version manual-full.xml diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index d556c7ebe1ed..f244c11d4f20 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -1,56 +1,59 @@ + Coding conventions +
+ Syntax -Coding conventions - - -
Syntax - - - - Use 2 spaces of indentation per indentation level in - Nix expressions, 4 spaces in shell scripts. - - Do not use tab characters, i.e. configure your - editor to use soft tabs. For instance, use (setq-default - indent-tabs-mode nil) in Emacs. Everybody has different - tab settings so it’s asking for trouble. - - Use lowerCamelCase for variable - names, not UpperCamelCase. Note, this rule does - not apply to package attribute names, which instead follow the rules - in . - - Function calls with attribute set arguments are - written as - + + + + Use 2 spaces of indentation per indentation level in Nix expressions, 4 + spaces in shell scripts. + + + + + Do not use tab characters, i.e. configure your editor to use soft tabs. + For instance, use (setq-default indent-tabs-mode nil) + in Emacs. Everybody has different tab settings so it’s asking for + trouble. + + + + + Use lowerCamelCase for variable names, not + UpperCamelCase. Note, this rule does not apply to + package attribute names, which instead follow the rules in + . + + + + + Function calls with attribute set arguments are written as foo { arg = ...; } - - not - + not foo { arg = ...; } - - Also fine is - + Also fine is foo { arg = ...; } - - if it's a short call. - - In attribute sets or lists that span multiple lines, - the attribute names or list elements should be aligned: - + if it's a short call. + + + + + In attribute sets or lists that span multiple lines, the attribute names + or list elements should be aligned: # A long list. list = @@ -73,12 +76,11 @@ attrs = { if true then big_expr else big_expr; }; - - - - Short lists or attribute sets can be written on one - line: - + + + + + Short lists or attribute sets can be written on one line: # A short list. list = [ elem1 elem2 elem3 ]; @@ -86,66 +88,58 @@ list = [ elem1 elem2 elem3 ]; # A short set. attrs = { x = 1280; y = 1024; }; - - - - Breaking in the middle of a function argument can - give hard-to-read code, like - + + + + + Breaking in the middle of a function argument can give hard-to-read code, + like someFunction { x = 1280; y = 1024; } otherArg yetAnotherArg - - (especially if the argument is very large, spanning multiple - lines). - - Better: - + (especially if the argument is very large, spanning multiple lines). + + + Better: someFunction { x = 1280; y = 1024; } otherArg yetAnotherArg - - or - + or let res = { x = 1280; y = 1024; }; in someFunction res otherArg yetAnotherArg - - - - The bodies of functions, asserts, and withs are not - indented to prevent a lot of superfluous indentation levels, i.e. - + + + + + The bodies of functions, asserts, and withs are not indented to prevent a + lot of superfluous indentation levels, i.e. { arg1, arg2 }: assert system == "i686-linux"; stdenv.mkDerivation { ... - - not - + not { arg1, arg2 }: assert system == "i686-linux"; stdenv.mkDerivation { ... - - - - Function formal arguments are written as: - + + + + + Function formal arguments are written as: { arg1, arg2, arg3 }: - - but if they don't fit on one line they're written as: - + but if they don't fit on one line they're written as: { arg1, arg2, arg3 , arg4, ... @@ -153,35 +147,28 @@ stdenv.mkDerivation { ... argN }: - - - - Functions should list their expected arguments as - precisely as possible. That is, write - + + + + + Functions should list their expected arguments as precisely as possible. + That is, write { stdenv, fetchurl, perl }: ... - - instead of - + instead of args: with args; ... - - or - + or { stdenv, fetchurl, perl, ... }: ... - - - - For functions that are truly generic in the number of - arguments (such as wrappers around mkDerivation) - that have some required arguments, you should write them using an - @-pattern: - + + + For functions that are truly generic in the number of arguments (such as + wrappers around mkDerivation) that have some required + arguments, you should write them using an @-pattern: { stdenv, doCoverageAnalysis ? false, ... } @ args: @@ -189,9 +176,7 @@ stdenv.mkDerivation (args // { ... if doCoverageAnalysis then "bla" else "" ... }) - - instead of - + instead of args: @@ -199,432 +184,557 @@ args.stdenv.mkDerivation (args // { ... if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "" ... }) + + + +
+
+ Package naming - - - - -
- - -
Package naming - -In Nixpkgs, there are generally three different names associated with a package: - - - - The name attribute of the - derivation (excluding the version part). This is what most users - see, in particular when using - nix-env. - - The variable name used for the instantiated package - in all-packages.nix, and when passing it as a - dependency to other functions. Typically this is called the - package attribute name. This is what Nix - expression authors see. It can also be used when installing using - nix-env -iA. - - The filename for (the directory containing) the Nix - expression. - - - -Most of the time, these are the same. For instance, the package -e2fsprogs has a name attribute -"e2fsprogs-version", is -bound to the variable name e2fsprogs in -all-packages.nix, and the Nix expression is in -pkgs/os-specific/linux/e2fsprogs/default.nix. - - -There are a few naming guidelines: - - - - Generally, try to stick to the upstream package - name. - - Don’t use uppercase letters in the - name attribute — e.g., - "mplayer-1.0rc2" instead of - "MPlayer-1.0rc2". - - The version part of the name - attribute must start with a digit (following a - dash) — e.g., "hello-0.3.1rc2". - - If a package is not a release but a commit from a repository, then - the version part of the name must be the date of that - (fetched) commit. The date must be in "YYYY-MM-DD" format. - Also append "unstable" to the name - e.g., - "pkgname-unstable-2014-09-23". - - Dashes in the package name should be preserved in - new variable names, rather than converted to underscores or camel - cased — e.g., http-parser instead of - http_parser or httpParser. The - hyphenated style is preferred in all three package - names. - - If there are multiple versions of a package, this - should be reflected in the variable names in - all-packages.nix, - e.g. json-c-0-9 and json-c-0-11. - If there is an obvious “default” version, make an attribute like - json-c = json-c-0-9;. - See also - - - - - -
- - -
File naming and organisation - -Names of files and directories should be in lowercase, with -dashes between words — not in camel case. For instance, it should be -all-packages.nix, not -allPackages.nix or -AllPackages.nix. - -
Hierarchy - -Each package should be stored in its own directory somewhere in -the pkgs/ tree, i.e. in -pkgs/category/subcategory/.../pkgname. -Below are some rules for picking the right category for a package. -Many packages fall under several categories; what matters is the -primary purpose of a package. For example, the -libxml2 package builds both a library and some -tools; but it’s a library foremost, so it goes under -pkgs/development/libraries. - -When in doubt, consider refactoring the -pkgs/ tree, e.g. creating new categories or -splitting up an existing category. - - - - If it’s used to support software development: + + In Nixpkgs, there are generally three different names associated with a + package: + - - - If it’s a library used by other packages: - - development/libraries (e.g. libxml2) - - - - If it’s a compiler: - - development/compilers (e.g. gcc) - - - - If it’s an interpreter: - - development/interpreters (e.g. guile) - - - - If it’s a (set of) development tool(s): - - - - If it’s a parser generator (including lexers): - - development/tools/parsing (e.g. bison, flex) - - - - If it’s a build manager: - - development/tools/build-managers (e.g. gnumake) - - - - Else: - - development/tools/misc (e.g. binutils) - - - - - - - Else: - - development/misc - - - + + The name attribute of the derivation (excluding the + version part). This is what most users see, in particular when using + nix-env. + - - - If it’s a (set of) tool(s): - (A tool is a relatively small program, especially one intended - to be used non-interactively.) + + The variable name used for the instantiated package in + all-packages.nix, and when passing it as a + dependency to other functions. Typically this is called the + package attribute name. This is what Nix expression + authors see. It can also be used when installing using nix-env + -iA. + + + + + The filename for (the directory containing) the Nix expression. + + + + Most of the time, these are the same. For instance, the package + e2fsprogs has a name attribute + "e2fsprogs-version", is bound + to the variable name e2fsprogs in + all-packages.nix, and the Nix expression is in + pkgs/os-specific/linux/e2fsprogs/default.nix. + + + + There are a few naming guidelines: + + + + Generally, try to stick to the upstream package name. + + + + + Don’t use uppercase letters in the name attribute + — e.g., "mplayer-1.0rc2" instead of + "MPlayer-1.0rc2". + + + + + The version part of the name attribute + must start with a digit (following a dash) — e.g., + "hello-0.3.1rc2". + + + + + If a package is not a release but a commit from a repository, then the + version part of the name must be the date of that + (fetched) commit. The date must be in "YYYY-MM-DD" + format. Also append "unstable" to the name - e.g., + "pkgname-unstable-2014-09-23". + + + + + Dashes in the package name should be preserved in new variable names, + rather than converted to underscores or camel cased — e.g., + http-parser instead of http_parser + or httpParser. The hyphenated style is preferred in + all three package names. + + + + + If there are multiple versions of a package, this should be reflected in + the variable names in all-packages.nix, e.g. + json-c-0-9 and json-c-0-11. If + there is an obvious “default” version, make an attribute like + json-c = json-c-0-9;. See also + + + + + +
+
+ File naming and organisation + + + Names of files and directories should be in lowercase, with dashes between + words — not in camel case. For instance, it should be + all-packages.nix, not + allPackages.nix or + AllPackages.nix. + + +
+ Hierarchy + + + Each package should be stored in its own directory somewhere in the + pkgs/ tree, i.e. in + pkgs/category/subcategory/.../pkgname. + Below are some rules for picking the right category for a package. Many + packages fall under several categories; what matters is the + primary purpose of a package. For example, the + libxml2 package builds both a library and some tools; + but it’s a library foremost, so it goes under + pkgs/development/libraries. + + + + When in doubt, consider refactoring the pkgs/ tree, + e.g. creating new categories or splitting up an existing category. + + + + + If it’s used to support software development: + - - If it’s for networking: - - tools/networking (e.g. wget) - - - - If it’s for text processing: - - tools/text (e.g. diffutils) - - - - If it’s a system utility, i.e., + + If it’s a library used by other packages: + + + development/libraries (e.g. + libxml2) + + + + + If it’s a compiler: + + + development/compilers (e.g. + gcc) + + + + + If it’s an interpreter: + + + development/interpreters (e.g. + guile) + + + + + If it’s a (set of) development tool(s): + + + + If it’s a parser generator (including lexers): + + + development/tools/parsing (e.g. + bison, flex) + + + + + If it’s a build manager: + + + development/tools/build-managers (e.g. + gnumake) + + + + + Else: + + + development/tools/misc (e.g. + binutils) + + + + + + + + Else: + + + development/misc + + + + + + + + If it’s a (set of) tool(s): + + + (A tool is a relatively small program, especially one intended to be + used non-interactively.) + + + + If it’s for networking: + + + tools/networking (e.g. + wget) + + + + + If it’s for text processing: + + + tools/text (e.g. diffutils) + + + + + If it’s a system utility, i.e., something related or essential to the operation of a system: - - tools/system (e.g. cron) - - - - If it’s an archiver (which may + + + tools/system (e.g. cron) + + + + + If it’s an archiver (which may include a compression function): - - tools/archivers (e.g. zip, tar) - - - - If it’s a compression program: - - tools/compression (e.g. gzip, bzip2) - - - - If it’s a security-related program: - - tools/security (e.g. nmap, gnupg) - - - - Else: - - tools/misc - - + + + tools/archivers (e.g. zip, + tar) + + + + + If it’s a compression program: + + + tools/compression (e.g. + gzip, bzip2) + + + + + If it’s a security-related program: + + + tools/security (e.g. nmap, + gnupg) + + + + + Else: + + + tools/misc + + + - - - - If it’s a shell: - - shells (e.g. bash) - - - - If it’s a server: - + + + + If it’s a shell: + + + shells (e.g. bash) + + + + + If it’s a server: + - - If it’s a web server: - - servers/http (e.g. apache-httpd) - - - - If it’s an implementation of the X Windowing System: - - servers/x11 (e.g. xorg — this includes the client libraries and programs) - - - - Else: - - servers/misc - - + + If it’s a web server: + + + servers/http (e.g. + apache-httpd) + + + + + If it’s an implementation of the X Windowing System: + + + servers/x11 (e.g. xorg — + this includes the client libraries and programs) + + + + + Else: + + + servers/misc + + + - - - - If it’s a desktop environment: - - desktops (e.g. kde, gnome, enlightenment) - - - - If it’s a window manager: - - applications/window-managers (e.g. awesome, stumpwm) - - - - If it’s an application: - - A (typically large) program with a distinct user - interface, primarily used interactively. + + + + If it’s a desktop environment: + + + desktops (e.g. kde, + gnome, enlightenment) + + + + + If it’s a window manager: + + + applications/window-managers (e.g. + awesome, stumpwm) + + + + + If it’s an application: + + + A (typically large) program with a distinct user interface, primarily + used interactively. + - - If it’s a version management system: - - applications/version-management (e.g. subversion) - - - - If it’s for video playback / editing: - - applications/video (e.g. vlc) - - - - If it’s for graphics viewing / editing: - - applications/graphics (e.g. gimp) - - - - If it’s for networking: - - - - If it’s a mailreader: - - applications/networking/mailreaders (e.g. thunderbird) - - - - If it’s a newsreader: - - applications/networking/newsreaders (e.g. pan) - - - - If it’s a web browser: - - applications/networking/browsers (e.g. firefox) - - - - Else: - - applications/networking/misc - - - - - - - Else: - - applications/misc - - + + If it’s a version management system: + + + applications/version-management (e.g. + subversion) + + + + + If it’s for video playback / editing: + + + applications/video (e.g. + vlc) + + + + + If it’s for graphics viewing / editing: + + + applications/graphics (e.g. + gimp) + + + + + If it’s for networking: + + + + If it’s a mailreader: + + + applications/networking/mailreaders (e.g. + thunderbird) + + + + + If it’s a newsreader: + + + applications/networking/newsreaders (e.g. + pan) + + + + + If it’s a web browser: + + + applications/networking/browsers (e.g. + firefox) + + + + + Else: + + + applications/networking/misc + + + + + + + + Else: + + + applications/misc + + + - - - - If it’s data (i.e., does not have a + + + + If it’s data (i.e., does not have a straight-forward executable semantics): - + - - If it’s a font: - - data/fonts - - - - If it’s related to SGML/XML processing: - - - - If it’s an XML DTD: - - data/sgml+xml/schemas/xml-dtd (e.g. docbook) - - - - If it’s an XSLT stylesheet: - - (Okay, these are executable...) - data/sgml+xml/stylesheets/xslt (e.g. docbook-xsl) - - - - - + + If it’s a font: + + + data/fonts + + + + + If it’s related to SGML/XML processing: + + + + If it’s an XML DTD: + + + data/sgml+xml/schemas/xml-dtd (e.g. + docbook) + + + + + If it’s an XSLT stylesheet: + + + (Okay, these are executable...) + + + data/sgml+xml/stylesheets/xslt (e.g. + docbook-xsl) + + + + + + - - - - If it’s a game: - - games - - - - Else: - - misc - - - + + + + If it’s a game: + + + games + + + + + Else: + + + misc + + + + +
-
+
+ Versioning -
Versioning + + Because every version of a package in Nixpkgs creates a potential + maintenance burden, old versions of a package should not be kept unless + there is a good reason to do so. For instance, Nixpkgs contains several + versions of GCC because other packages don’t build with the latest + version of GCC. Other examples are having both the latest stable and latest + pre-release version of a package, or to keep several major releases of an + application that differ significantly in functionality. + -Because every version of a package in Nixpkgs creates a -potential maintenance burden, old versions of a package should not be -kept unless there is a good reason to do so. For instance, Nixpkgs -contains several versions of GCC because other packages don’t build -with the latest version of GCC. Other examples are having both the -latest stable and latest pre-release version of a package, or to keep -several major releases of an application that differ significantly in -functionality. + + If there is only one version of a package, its Nix expression should be + named e2fsprogs/default.nix. If there are multiple + versions, this should be reflected in the filename, e.g. + e2fsprogs/1.41.8.nix and + e2fsprogs/1.41.9.nix. The version in the filename + should leave out unnecessary detail. For instance, if we keep the latest + Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named + firefox/2.0.nix and + firefox/3.5.nix, respectively (which, at a given + point, might contain versions 2.0.0.20 and + 3.5.4). If a version requires many auxiliary files, you + can use a subdirectory for each version, e.g. + firefox/2.0/default.nix and + firefox/3.5/default.nix. + -If there is only one version of a package, its Nix expression -should be named e2fsprogs/default.nix. If there -are multiple versions, this should be reflected in the filename, -e.g. e2fsprogs/1.41.8.nix and -e2fsprogs/1.41.9.nix. The version in the -filename should leave out unnecessary detail. For instance, if we -keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they -should be named firefox/2.0.nix and -firefox/3.5.nix, respectively (which, at a given -point, might contain versions 2.0.0.20 and -3.5.4). If a version requires many auxiliary -files, you can use a subdirectory for each version, -e.g. firefox/2.0/default.nix and -firefox/3.5/default.nix. + + All versions of a package must be included in + all-packages.nix to make sure that they evaluate + correctly. + +
+
+
+ Fetching Sources -All versions of a package must be included -in all-packages.nix to make sure that they -evaluate correctly. - -
- -
-
Fetching Sources - There are multiple ways to fetch a package source in nixpkgs. The - general guideline is that you should package sources with a high degree of - availability. Right now there is only one fetcher which has mirroring - support and that is fetchurl. Note that you should also - prefer protocols which have a corresponding proxy environment variable. + + There are multiple ways to fetch a package source in nixpkgs. The general + guideline is that you should package sources with a high degree of + availability. Right now there is only one fetcher which has mirroring + support and that is fetchurl. Note that you should also + prefer protocols which have a corresponding proxy environment variable. - You can find many source fetch helpers in pkgs/build-support/fetch*. + + + You can find many source fetch helpers in + pkgs/build-support/fetch*. - In the file pkgs/top-level/all-packages.nix you can - find fetch helpers, these have names on the form - fetchFrom*. The intention of these are to provide - snapshot fetches but using the same api as some of the version controlled - fetchers from pkgs/build-support/. As an example going - from bad to good: - - - Bad: Uses git:// which won't be proxied. + + + In the file pkgs/top-level/all-packages.nix you can find + fetch helpers, these have names on the form fetchFrom*. + The intention of these are to provide snapshot fetches but using the same + api as some of the version controlled fetchers from + pkgs/build-support/. As an example going from bad to + good: + + + + Bad: Uses git:// which won't be proxied. src = fetchgit { url = "git://github.com/NixOS/nix.git"; @@ -632,10 +742,11 @@ src = fetchgit { sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; } - - - - Better: This is ok, but an archive fetch will still be faster. + + + + + Better: This is ok, but an archive fetch will still be faster. src = fetchgit { url = "https://github.com/NixOS/nix.git"; @@ -643,10 +754,11 @@ src = fetchgit { sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; } - - - - Best: Fetches a snapshot archive and you get the rev you want. + + + + + Best: Fetches a snapshot archive and you get the rev you want. src = fetchFromGitHub { owner = "NixOS"; @@ -655,15 +767,19 @@ src = fetchFromGitHub { sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; } - - - + + + + +
+
+ Patches + + + Patches available online should be retrieved using + fetchpatch. -
-
Patches - Patches available online should be retrieved using - fetchpatch. patches = [ @@ -675,30 +791,54 @@ patches = [ ]; - Otherwise, you can add a .patch file to the - nixpkgs repository. In the interest of keeping our - maintenance burden to a minimum, only patches that are unique - to nixpkgs should be added in this way. - -patches = [ ./0001-changes.patch ]; - - If you do need to do create this sort of patch file, - one way to do so is with git: - - Move to the root directory of the source code - you're patching. -$ cd the/program/source - If a git repository is not already present, - create one and stage all of the source files. -$ git init -$ git add . - Edit some files to make whatever changes need - to be included in the patch. - Use git to create a diff, and pipe the output - to a patch file: -$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch - - -
+ + Otherwise, you can add a .patch file to the + nixpkgs repository. In the interest of keeping our + maintenance burden to a minimum, only patches that are unique to + nixpkgs should be added in this way. + + + + +patches = [ ./0001-changes.patch ]; + + + + + If you do need to do create this sort of patch file, one way to do so is + with git: + + + + Move to the root directory of the source code you're patching. + +$ cd the/program/source + + + + + If a git repository is not already present, create one and stage all of + the source files. + +$ git init +$ git add . + + + + + Edit some files to make whatever changes need to be included in the + patch. + + + + + Use git to create a diff, and pipe the output to a patch file: + +$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch + + + + +
diff --git a/doc/configuration.xml b/doc/configuration.xml index 5370265c53ad..4411b4844e99 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -1,42 +1,51 @@ - -Global configuration - -Nix comes with certain defaults about what packages can and -cannot be installed, based on a package's metadata. By default, Nix -will prevent installation if any of the following criteria are -true: - - - The package is thought to be broken, and has had - its meta.broken set to - true. - - The package isn't intended to run on the given system, as none of its meta.platforms match the given system. - - The package's meta.license is set - to a license which is considered to be unfree. - - The package has known security vulnerabilities but - has not or can not be updated for some reason, and a list of issues - has been entered in to the package's - meta.knownVulnerabilities. - - -Note that all this is checked during evaluation already, -and the check includes any package that is evaluated. -In particular, all build-time dependencies are checked. -nix-env -qa will (attempt to) hide any packages -that would be refused. - - -Each of these criteria can be altered in the nixpkgs -configuration. - -The nixpkgs configuration for a NixOS system is set in the -configuration.nix, as in the following example: + Global configuration + + Nix comes with certain defaults about what packages can and cannot be + installed, based on a package's metadata. By default, Nix will prevent + installation if any of the following criteria are true: + + + + + The package is thought to be broken, and has had its + meta.broken set to true. + + + + + The package isn't intended to run on the given system, as none of its + meta.platforms match the given system. + + + + + The package's meta.license is set to a license which is + considered to be unfree. + + + + + The package has known security vulnerabilities but has not or can not be + updated for some reason, and a list of issues has been entered in to the + package's meta.knownVulnerabilities. + + + + + Note that all this is checked during evaluation already, and the check + includes any package that is evaluated. In particular, all build-time + dependencies are checked. nix-env -qa will (attempt to) + hide any packages that would be refused. + + + Each of these criteria can be altered in the nixpkgs configuration. + + + The nixpkgs configuration for a NixOS system is set in the + configuration.nix, as in the following example: { nixpkgs.config = { @@ -44,187 +53,197 @@ configuration. }; } -However, this does not allow unfree software for individual users. -Their configurations are managed separately. - -A user's of nixpkgs configuration is stored in a user-specific -configuration file located at -~/.config/nixpkgs/config.nix. For example: + However, this does not allow unfree software for individual users. Their + configurations are managed separately. + + + A user's of nixpkgs configuration is stored in a user-specific configuration + file located at ~/.config/nixpkgs/config.nix. For + example: { allowUnfree = true; } - - -Note that we are not able to test or build unfree software on Hydra -due to policy. Most unfree licenses prohibit us from either executing or -distributing the software. - -
+ + + Note that we are not able to test or build unfree software on Hydra due to + policy. Most unfree licenses prohibit us from either executing or + distributing the software. + +
Installing broken packages - - There are two ways to try compiling a package which has been - marked as broken. + + There are two ways to try compiling a package which has been marked as + broken. + - - For allowing the build of a broken package once, you can use an - environment variable for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_BROKEN=1 - - - - For permanently allowing broken packages to be built, you may - add allowBroken = true; to your user's - configuration file, like this: - + + + For allowing the build of a broken package once, you can use an + environment variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_BROKEN=1 + + + + + For permanently allowing broken packages to be built, you may add + allowBroken = true; to your user's configuration file, + like this: { allowBroken = true; } - + + -
- -
+
+
Installing packages on unsupported systems - - There are also two ways to try compiling a package which has been marked as unsuported for the given system. + There are also two ways to try compiling a package which has been marked as + unsuported for the given system. - - For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 - - - - - For permanently allowing broken packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: - + + + For allowing the build of a broken package once, you can use an + environment variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 + + + + + For permanently allowing broken packages to be built, you may add + allowUnsupportedSystem = true; to your user's + configuration file, like this: { allowUnsupportedSystem = true; } - - + + - The difference between an a package being unsupported on some system and being broken is admittedly a bit fuzzy. - If a program ought to work on a certain platform, but doesn't, the platform should be included in meta.platforms, but marked as broken with e.g. meta.broken = !hostPlatform.isWindows. - Of course, this begs the question of what "ought" means exactly. - That is left to the package maintainer. + The difference between an a package being unsupported on some system and + being broken is admittedly a bit fuzzy. If a program + ought to work on a certain platform, but doesn't, the + platform should be included in meta.platforms, but marked + as broken with e.g. meta.broken = + !hostPlatform.isWindows. Of course, this begs the question of what + "ought" means exactly. That is left to the package maintainer. -
- -
+
+
Installing unfree packages - There are several ways to tweak how Nix handles a package - which has been marked as unfree. + + There are several ways to tweak how Nix handles a package which has been + marked as unfree. + - - To temporarily allow all unfree packages, you can use an - environment variable for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_UNFREE=1 - - - - It is possible to permanently allow individual unfree packages, - while still blocking unfree packages by default using the - allowUnfreePredicate configuration - option in the user configuration file. - - This option is a function which accepts a package as a - parameter, and returns a boolean. The following example - configuration accepts a package and always returns false: + + + To temporarily allow all unfree packages, you can use an environment + variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_UNFREE=1 + + + + + It is possible to permanently allow individual unfree packages, while + still blocking unfree packages by default using the + allowUnfreePredicate configuration option in the user + configuration file. + + + This option is a function which accepts a package as a parameter, and + returns a boolean. The following example configuration accepts a package + and always returns false: { allowUnfreePredicate = (pkg: false); } - - - A more useful example, the following configuration allows - only allows flash player and visual studio code: - + + + A more useful example, the following configuration allows only allows + flash player and visual studio code: { allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]); } - - - - It is also possible to whitelist and blacklist licenses - that are specifically acceptable or not acceptable, using - whitelistedLicenses and - blacklistedLicenses, respectively. - - - The following example configuration whitelists the - licenses amd and wtfpl: - + + + + + It is also possible to whitelist and blacklist licenses that are + specifically acceptable or not acceptable, using + whitelistedLicenses and + blacklistedLicenses, respectively. + + + The following example configuration whitelists the licenses + amd and wtfpl: { whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; } - - - The following example configuration blacklists the - gpl3 and agpl3 licenses: - + + + The following example configuration blacklists the gpl3 + and agpl3 licenses: { blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; } - - + + - A complete list of licenses can be found in the file - lib/licenses.nix of the nixpkgs tree. -
+ + A complete list of licenses can be found in the file + lib/licenses.nix of the nixpkgs tree. + +
+
+ Installing insecure packages - -
- - Installing insecure packages - - - There are several ways to tweak how Nix handles a package - which has been marked as insecure. + + There are several ways to tweak how Nix handles a package which has been + marked as insecure. + - - To temporarily allow all insecure packages, you can use an - environment variable for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_INSECURE=1 - - - - It is possible to permanently allow individual insecure - packages, while still blocking other insecure packages by - default using the permittedInsecurePackages - configuration option in the user configuration file. - - The following example configuration permits the - installation of the hypothetically insecure package - hello, version 1.2.3: + + + To temporarily allow all insecure packages, you can use an environment + variable for a single invocation of the nix tools: +$ export NIXPKGS_ALLOW_INSECURE=1 + + + + + It is possible to permanently allow individual insecure packages, while + still blocking other insecure packages by default using the + permittedInsecurePackages configuration option in the + user configuration file. + + + The following example configuration permits the installation of the + hypothetically insecure package hello, version + 1.2.3: { permittedInsecurePackages = [ @@ -232,47 +251,44 @@ distributing the software. ]; } - - - - - It is also possible to create a custom policy around which - insecure packages to allow and deny, by overriding the - allowInsecurePredicate configuration - option. - - The allowInsecurePredicate option is a - function which accepts a package and returns a boolean, much - like allowUnfreePredicate. - - The following configuration example only allows insecure - packages with very short names: - + + + + + It is also possible to create a custom policy around which insecure + packages to allow and deny, by overriding the + allowInsecurePredicate configuration option. + + + The allowInsecurePredicate option is a function which + accepts a package and returns a boolean, much like + allowUnfreePredicate. + + + The following configuration example only allows insecure packages with + very short names: { allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) <= 5); } - - - Note that permittedInsecurePackages is - only checked if allowInsecurePredicate is not - specified. - + + + Note that permittedInsecurePackages is only checked if + allowInsecurePredicate is not specified. + + -
- +
+
+ Modify packages via <literal>packageOverrides</literal> -
Modify -packages via <literal>packageOverrides</literal> - -You can define a function called -packageOverrides in your local -~/.config/nixpkgs/config.nix to override nix packages. It -must be a function that takes pkgs as an argument and return modified -set of packages. - + + You can define a function called packageOverrides in your + local ~/.config/nixpkgs/config.nix to override nix + packages. It must be a function that takes pkgs as an argument and return + modified set of packages. { packageOverrides = pkgs: rec { @@ -280,30 +296,27 @@ set of packages. }; } - - - -
- -
+ +
+
Declarative Package Management
- Build an environment + Build an environment - - Using packageOverrides, it is possible to manage - packages declaratively. This means that we can list all of our desired - packages within a declarative Nix expression. For example, to have - aspell, bc, - ffmpeg, coreutils, - gdb, nixUnstable, - emscripten, jq, - nox, and silver-searcher, we could - use the following in ~/.config/nixpkgs/config.nix: - + + Using packageOverrides, it is possible to manage + packages declaratively. This means that we can list all of our desired + packages within a declarative Nix expression. For example, to have + aspell, bc, + ffmpeg, coreutils, + gdb, nixUnstable, + emscripten, jq, + nox, and silver-searcher, we could + use the following in ~/.config/nixpkgs/config.nix: + - + { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { @@ -314,17 +327,17 @@ set of packages. } - - To install it into our environment, you can just run nix-env -iA - nixpkgs.myPackages. If you want to load the packages to be built - from a working copy of nixpkgs you just run - nix-env -f. -iA myPackages. To explore what's been - installed, just look through ~/.nix-profile/. You can - see that a lot of stuff has been installed. Some of this stuff is useful - some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: - + + To install it into our environment, you can just run nix-env -iA + nixpkgs.myPackages. If you want to load the packages to be built + from a working copy of nixpkgs you just run + nix-env -f. -iA myPackages. To explore what's been + installed, just look through ~/.nix-profile/. You can + see that a lot of stuff has been installed. Some of this stuff is useful + some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: + - + { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { @@ -336,31 +349,30 @@ set of packages. } - - pathsToLink tells Nixpkgs to only link the paths listed - which gets rid of the extra stuff in the profile. - /bin and /share are good - defaults for a user environment, getting rid of the clutter. If you are - running on Nix on MacOS, you may want to add another path as well, - /Applications, that makes GUI apps available. - - + + pathsToLink tells Nixpkgs to only link the paths listed + which gets rid of the extra stuff in the profile. /bin + and /share are good defaults for a user environment, + getting rid of the clutter. If you are running on Nix on MacOS, you may + want to add another path as well, /Applications, that + makes GUI apps available. +
- Getting documentation + Getting documentation - - After building that new environment, look through - ~/.nix-profile to make sure everything is there that - we wanted. Discerning readers will note that some files are missing. Look - inside ~/.nix-profile/share/man/man1/ to verify this. - There are no man pages for any of the Nix tools! This is because some - packages like Nix have multiple outputs for things like documentation (see - section 4). Let's make Nix install those as well. - + + After building that new environment, look through + ~/.nix-profile to make sure everything is there that + we wanted. Discerning readers will note that some files are missing. Look + inside ~/.nix-profile/share/man/man1/ to verify this. + There are no man pages for any of the Nix tools! This is because some + packages like Nix have multiple outputs for things like documentation (see + section 4). Let's make Nix install those as well. + - + { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { @@ -373,14 +385,13 @@ set of packages. } - - This provides us with some useful documentation for using our packages. - However, if we actually want those manpages to be detected by man, we need - to set up our environment. This can also be managed within Nix - expressions. - + + This provides us with some useful documentation for using our packages. + However, if we actually want those manpages to be detected by man, we need + to set up our environment. This can also be managed within Nix expressions. + - + { packageOverrides = pkgs: with pkgs; rec { myProfile = writeText "my-profile" '' @@ -412,13 +423,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh } - - For this to work fully, you must also have this script sourced when you - are logged in. Try adding something like this to your - ~/.profile file: - + + For this to work fully, you must also have this script sourced when you are + logged in. Try adding something like this to your + ~/.profile file: + - + #!/bin/sh if [ -d $HOME/.nix-profile/etc/profile.d ]; then for i in $HOME/.nix-profile/etc/profile.d/*.sh; do @@ -429,23 +440,22 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then fi - - Now just run source $HOME/.profile and you can starting - loading man pages from your environent. - - + + Now just run source $HOME/.profile and you can starting + loading man pages from your environent. +
- GNU info setup + GNU info setup - - Configuring GNU info is a little bit trickier than man pages. To work - correctly, info needs a database to be generated. This can be done with - some small modifications to our environment scripts. - + + Configuring GNU info is a little bit trickier than man pages. To work + correctly, info needs a database to be generated. This can be done with + some small modifications to our environment scripts. + - + { packageOverrides = pkgs: with pkgs; rec { myProfile = writeText "my-profile" '' @@ -487,16 +497,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh } - - postBuild tells Nixpkgs to run a command after building - the environment. In this case, install-info adds the - installed info pages to dir which is GNU info's default - root node. Note that texinfoInteractive is added to the - environment to give the install-info command. - - + + postBuild tells Nixpkgs to run a command after building + the environment. In this case, install-info adds the + installed info pages to dir which is GNU info's default + root node. Note that texinfoInteractive is added to the + environment to give the install-info command. +
- -
- +
diff --git a/doc/contributing.xml b/doc/contributing.xml index 7aa0df271ff4..d28442b7a2c6 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -1,35 +1,35 @@ - -Contributing to this documentation - -The DocBook sources of the Nixpkgs manual are in the Contributing to this documentation + + The DocBook sources of the Nixpkgs manual are in the + doc -subdirectory of the Nixpkgs repository. - -You can quickly check your edits with make: - + subdirectory of the Nixpkgs repository. + + + You can quickly check your edits with make: + $ cd /path/to/nixpkgs/doc $ nix-shell [nix-shell]$ make - -If you experience problems, run make debug -to help understand the docbook errors. - -After making modifications to the manual, it's important to -build it before committing. You can do that as follows: - + + If you experience problems, run make debug to help + understand the docbook errors. + + + After making modifications to the manual, it's important to build it before + committing. You can do that as follows: $ cd /path/to/nixpkgs/doc $ nix-shell [nix-shell]$ make clean [nix-shell]$ nix-build . - -If the build succeeds, the manual will be in -./result/share/doc/nixpkgs/manual.html. - + If the build succeeds, the manual will be in + ./result/share/doc/nixpkgs/manual.html. + diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 0b2b85aeeef6..fe0e0d88d30e 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -1,308 +1,469 @@ - -Cross-compilation - -
+ Cross-compilation +
Introduction + - "Cross-compilation" means compiling a program on one machine for another type of machine. - For example, a typical use of cross compilation is to compile programs for embedded devices. - These devices often don't have the computing power and memory to compile their own programs. - One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine. - Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling. + "Cross-compilation" means compiling a program on one machine for another + type of machine. For example, a typical use of cross compilation is to + compile programs for embedded devices. These devices often don't have the + computing power and memory to compile their own programs. One might think + that cross-compilation is a fairly niche concern, but there are advantages + to being rigorous about distinguishing build-time vs run-time environments + even when one is developing and deploying on the same machine. Nixpkgs is + increasingly adopting the opinion that packages should be written with + cross-compilation in mind, and nixpkgs should evaluate in a similar way (by + minimizing cross-compilation-specific special cases) whether or not one is + cross-compiling. - This chapter will be organized in three parts. - First, it will describe the basics of how to package software in a way that supports cross-compilation. - Second, it will describe how to use Nixpkgs when cross-compiling. - Third, it will describe the internal infrastructure supporting cross-compilation. + This chapter will be organized in three parts. First, it will describe the + basics of how to package software in a way that supports cross-compilation. + Second, it will describe how to use Nixpkgs when cross-compiling. Third, it + will describe the internal infrastructure supporting cross-compilation. -
- +
- -
+
Packaging in a cross-friendly manner
- Platform parameters - - Nixpkgs follows the common historical convention of GNU autoconf of distinguishing between 3 types of platform: build, host, and target. + Platform parameters - In summary, build is the platform on which a package is being built, host is the platform on which it is to run. The third attribute, target, is relevant only for certain specific compilers and build tools. - + + Nixpkgs follows the + common + historical convention of GNU autoconf of distinguishing between 3 + types of platform: build, + host, and target. In + summary, build is the platform on which a package + is being built, host is the platform on which it + is to run. The third attribute, target, is + relevant only for certain specific compilers and build tools. + - - In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform, hostPlatform, and targetPlatform. - All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with callPackage: - { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform..., or just off stdenv: - { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform.... - - - - buildPlatform - - The "build platform" is the platform on which a package is built. - Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore. - - - - hostPlatform - - The "host platform" is the platform on which a package will be run. - This is the simplest platform to understand, but also the one with the worst name. - - - - targetPlatform - - - The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. - Instead, it is only relevant for compatibility with building certain specific compilers and build tools. - It can be safely ignored for all other packages. - - - The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. - The task specifying this single "target platform" is thus pushed to build time of the compiler. - The root cause of this mistake is often that the compiler (which will be run on the host) and the the standard library/runtime (which will be run on the target) are built by a single build process. - - - There is no fundamental need to think about a single target ahead of time like this. - If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. - An example of such a tool is LLVM. - - - Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. - Nixpkgs tries to avoid sharing in the mistake where possible. - Still, because the concept of a target platform is so ingrained, it is best to support it as is. - - - - - - The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. - You can see examples of ones used in practice in lib.systems.examples; note how they are not all very consistent. - For now, here are few fields can count on them containing: - - - - system - - - This is a two-component shorthand for the platform. - Examples of this would be "x86_64-darwin" and "i686-linux"; see lib.systems.doubles for more. - This format isn't very standard, but has built-in support in Nix, such as the builtins.currentSystem impure string. - - - - - config - - - This is a 3- or 4- component shorthand for the platform. - Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14". - This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the targetPlatform. - This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. - This needs a better name than config! - - - - - parsed - - - This is a nix representation of a parsed LLVM target triple with white-listed components. - This can be specified directly, or actually parsed from the config. - [Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.] - See lib.systems.parse for the exact representation. - - - - - libc - - - This is a string identifying the standard C library used. - Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. - It should probably be refactored to use the module system, like parse. - - - - - is* - - - These predicates are defined in lib.systems.inspect, and slapped on every platform. - They are superior to the ones in stdenv as they force the user to be explicit about which platform they are inspecting. - Please use these instead of those. - - - - - platform - - - This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). - See lib.systems.platforms for examples—there's hopefully one in there that will work verbatim for each platform that is working. - Please help us triage these flags and give them better homes! - - - - + + In Nixpkgs, these three platforms are defined as attribute sets under the + names buildPlatform, hostPlatform, + and targetPlatform. All three are always defined as + attributes in the standard environment, and at the top level. That means + one can get at them just like a dependency in a function that is imported + with callPackage: +{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform... + , or just off stdenv: +{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... + . + + + + + buildPlatform + + + + The "build platform" is the platform on which a package is built. Once + someone has a built package, or pre-built binary package, the build + platform should not matter and be safe to ignore. + + + + + hostPlatform + + + + The "host platform" is the platform on which a package will be run. This + is the simplest platform to understand, but also the one with the worst + name. + + + + + targetPlatform + + + + The "target platform" attribute is, unlike the other two attributes, not + actually fundamental to the process of building software. Instead, it is + only relevant for compatibility with building certain specific compilers + and build tools. It can be safely ignored for all other packages. + + + The build process of certain compilers is written in such a way that the + compiler resulting from a single build can itself only produce binaries + for a single platform. The task specifying this single "target platform" + is thus pushed to build time of the compiler. The root cause of this + mistake is often that the compiler (which will be run on the host) and + the the standard library/runtime (which will be run on the target) are + built by a single build process. + + + There is no fundamental need to think about a single target ahead of + time like this. If the tool supports modular or pluggable backends, both + the need to specify the target at build time and the constraint of + having only a single target disappear. An example of such a tool is + LLVM. + + + Although the existence of a "target platfom" is arguably a historical + mistake, it is a common one: examples of tools that suffer from it are + GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the + mistake where possible. Still, because the concept of a target platform + is so ingrained, it is best to support it as is. + + + + + + + The exact schema these fields follow is a bit ill-defined due to a long and + convoluted evolution, but this is slowly being cleaned up. You can see + examples of ones used in practice in + lib.systems.examples; note how they are not all very + consistent. For now, here are few fields can count on them containing: + + + + + system + + + + This is a two-component shorthand for the platform. Examples of this + would be "x86_64-darwin" and "i686-linux"; see + lib.systems.doubles for more. This format isn't very + standard, but has built-in support in Nix, such as the + builtins.currentSystem impure string. + + + + + config + + + + This is a 3- or 4- component shorthand for the platform. Examples of + this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14". + This is a standard format called the "LLVM target triple", as they are + pioneered by LLVM and traditionally just used for the + targetPlatform. This format is strictly more + informative than the "Nix host double", as the previous format could + analogously be termed. This needs a better name than + config! + + + + + parsed + + + + This is a nix representation of a parsed LLVM target triple with + white-listed components. This can be specified directly, or actually + parsed from the config. [Technically, only one need + be specified and the others can be inferred, though the precision of + inference may not be very good.] See + lib.systems.parse for the exact representation. + + + + + libc + + + + This is a string identifying the standard C library used. Valid + identifiers include "glibc" for GNU libc, "libSystem" for Darwin's + Libsystem, and "uclibc" for µClibc. It should probably be refactored to + use the module system, like parse. + + + + + is* + + + + These predicates are defined in lib.systems.inspect, + and slapped on every platform. They are superior to the ones in + stdenv as they force the user to be explicit about + which platform they are inspecting. Please use these instead of those. + + + + + platform + + + + This is, quite frankly, a dumping ground of ad-hoc settings (it's an + attribute set). See lib.systems.platforms for + examples—there's hopefully one in there that will work verbatim for + each platform that is working. Please help us triage these flags and + give them better homes! + + + +
- Specifying Dependencies + Specifying Dependencies + + + In this section we explore the relationship between both runtime and + buildtime dependencies and the 3 Autoconf platforms. + + + + A runtime dependency between 2 packages implies that between them both the + host and target platforms match. This is directly implied by the meaning of + "host platform" and "runtime dependency": The package dependency exists + while both packages are running on a single host platform. + + + + A build time dependency, however, implies a shift in platforms between the + depending package and the depended-on package. The meaning of a build time + dependency is that to build the depending package we need to be able to run + the depended-on's package. The depending package's build platform is + therefore equal to the depended-on package's host platform. Analogously, + the depending package's host platform is equal to the depended-on package's + target platform. + + + + In this manner, given the 3 platforms for one package, we can determine the + three platforms for all its transitive dependencies. This is the most + important guiding principle behind cross-compilation with Nixpkgs, and will + be called the sliding window principle. + + + + Some examples will probably make this clearer. If a package is being built + with a (build, host, target) platform triple of + (foo, bar, bar), then its build-time dependencies would + have a triple of (foo, foo, bar), and those + packages' build-time dependencies would have triple of + (foo, foo, foo). In other words, it should take two + "rounds" of following build-time dependency edges before one reaches a + fixed point where, by the sliding window principle, the platform triple no + longer changes. Indeed, this happens with cross compilation, where only + rounds of native dependencies starting with the second necessarily coincide + with native packages. + + + - In this section we explore the relationship between both runtime and buildtime dependencies and the 3 Autoconf platforms. + The depending package's target platform is unconstrained by the sliding + window principle, which makes sense in that one can in principle build + cross compilers targeting arbitrary platforms. + + + + How does this work in practice? Nixpkgs is now structured so that + build-time dependencies are taken from buildPackages, + whereas run-time dependencies are taken from the top level attribute set. + For example, buildPackages.gcc should be used at build + time, while gcc should be used at run time. Now, for + most of Nixpkgs's history, there was no buildPackages, + and most packages have not been refactored to use it explicitly. Instead, + one can use the six (gasp) attributes used for + specifying dependencies as documented in + . We "splice" together the + run-time and build-time package sets with callPackage, + and then mkDerivation for each of four attributes pulls + the right derivation out. This splicing can be skipped when not cross + compiling as the package sets are the same, but is a bit slow for cross + compiling. Because of this, a best-of-both-worlds solution is in the works + with no splicing or explicit access of buildPackages + needed. For now, feel free to use either method. + + + - A runtime dependency between 2 packages implies that between them both the host and target platforms match. - This is directly implied by the meaning of "host platform" and "runtime dependency": - The package dependency exists while both packages are running on a single host platform. + There is also a "backlink" targetPackages, yielding a + package set whose buildPackages is the current package + set. This is a hack, though, to accommodate compilers with lousy build + systems. Please do not use this unless you are absolutely sure you are + packaging such a compiler and there is no other way. - - A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package. - The meaning of a build time dependency is that to build the depending package we need to be able to run the depended-on's package. - The depending package's build platform is therefore equal to the depended-on package's host platform. - Analogously, the depending package's host platform is equal to the depended-on package's target platform. - - - In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies. - This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the sliding window principle. - - - Some examples will probably make this clearer. - If a package is being built with a (build, host, target) platform triple of (foo, bar, bar), then its build-time dependencies would have a triple of (foo, foo, bar), and those packages' build-time dependencies would have triple of (foo, foo, foo). - In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes. - Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages. - - - The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms. - - - How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set. - For example, buildPackages.gcc should be used at build time, while gcc should be used at run time. - Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly. - Instead, one can use the six (gasp) attributes used for specifying dependencies as documented in . - We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out. - This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling. - Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed. - For now, feel free to use either method. - - - There is also a "backlink" targetPackages, yielding a package set whose buildPackages is the current package set. - This is a hack, though, to accommodate compilers with lousy build systems. - Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way. - +
- Cross packagaing cookbook - - Some frequently problems when packaging for cross compilation are good to just spell and answer. - Ideally the information above is exhaustive, so this section cannot provide any new information, - but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. - Feel free to add to this list! - - - - - What if my package's build system needs to build a C program to be run under the build environment? - - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - Add it to your mkDerivation invocation. - - - - - My package fails to find ar. - - - Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. - It only provides a prefixed one, just as it only does for all the other binutils programs. - It may be necessary to patch the package to fix the build system to use a prefixed `ar`. - - - - - My package's testsuite needs to run host platform code. - - - doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; - Add it to your mkDerivation invocation. - - - -
-
+ Cross packagaing cookbook + + Some frequently problems when packaging for cross compilation are good to + just spell and answer. Ideally the information above is exhaustive, so this + section cannot provide any new information, but its ludicrous and cruel to + expect everyone to spend effort working through the interaction of many + features just to figure out the same answer to the same common problem. + Feel free to add to this list! + + + + + + + What if my package's build system needs to build a C program to be run + under the build environment? + + + + +depsBuildBuild = [ buildPackages.stdenv.cc ]; + Add it to your mkDerivation invocation. + + + + + + + My package fails to find ar. + + + + + Many packages assume that an unprefixed ar is + available, but Nix doesn't provide one. It only provides a prefixed one, + just as it only does for all the other binutils programs. It may be + necessary to patch the package to fix the build system to use a prefixed + `ar`. + + + + + + + My package's testsuite needs to run host platform code. + + + + +doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; + Add it to your mkDerivation invocation. + + + + +
+ - -
+
Cross-building packages - - More information needs to moved from the old wiki, especially , for this section. - + + + + More information needs to moved from the old wiki, especially + , for this + section. + + + - Nixpkgs can be instantiated with localSystem alone, in which case there is no cross compiling and everything is built by and for that system, - or also with crossSystem, in which case packages run on the latter, but all building happens on the former. - Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. - As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice. - You can use them programmatically, or on the command line: + Nixpkgs can be instantiated with localSystem alone, in + which case there is no cross compiling and everything is built by and for + that system, or also with crossSystem, in which case + packages run on the latter, but all building happens on the former. Both + parameters take the same schema as the 3 (build, host, and target) platforms + defined in the previous section. As mentioned above, + lib.systems.examples has some platforms which are used as + arguments for these parameters in practice. You can use them + programmatically, or on the command line: + nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever + - - Eventually we would like to make these platform examples an unnecessary convenience so that + + Eventually we would like to make these platform examples an unnecessary + convenience so that + nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<vendor>-<abi>' -A whatever - works in the vast majority of cases. - The problem today is dependencies on other sorts of configuration which aren't given proper defaults. - We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. - Issue #34274 tracks this inconvenience along with its root cause in crufty configuration options. - + works in the vast majority of cases. The problem today is dependencies on + other sorts of configuration which aren't given proper defaults. We rely on + the examples to crudely to set those configuration parameters in some + vaguely sane manner on the users behalf. Issue + #34274 + tracks this inconvenience along with its root cause in crufty configuration + options. + + - While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. - As discussed in the previous section, only one of system, config, and parsed is needed to infer the other two. - Additionally, libc will be inferred from parse. - Finally, localSystem.system is also impurely inferred based on the platform evaluation occurs. - This means it is often not necessary to pass localSystem at all, as in the command-line example in the previous paragraph. + While one is free to pass both parameters in full, there's a lot of logic to + fill in missing fields. As discussed in the previous section, only one of + system, config, and + parsed is needed to infer the other two. Additionally, + libc will be inferred from parse. + Finally, localSystem.system is also + impurely inferred based on the platform evaluation + occurs. This means it is often not necessary to pass + localSystem at all, as in the command-line example in the + previous paragraph. + - - Many sources (manual, wiki, etc) probably mention passing system, platform, along with the optional crossSystem to nixpkgs: - import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }. - Passing those two instead of localSystem is still supported for compatibility, but is discouraged. - Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience. - + + Many sources (manual, wiki, etc) probably mention passing + system, platform, along with the + optional crossSystem to nixpkgs: import + <nixpkgs> { system = ..; platform = ..; crossSystem = ..; + }. Passing those two instead of localSystem is + still supported for compatibility, but is discouraged. Indeed, much of the + inference we do for these parameters is motivated by compatibility as much + as convenience. + + - One would think that localSystem and crossSystem overlap horribly with the three *Platforms (buildPlatform, hostPlatform, and targetPlatform; see stage.nix or the manual). - Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: - While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. - A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. - That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or buildPackages, the three platforms will be defined as one of localSystem or crossSystem, with the former replacing the latter as one traverses build-time dependencies. - A last simple difference then is crossSystem should be null when one doesn't want to cross-compile, while the *Platforms are always non-null. - localSystem is always non-null. + One would think that localSystem and + crossSystem overlap horribly with the three + *Platforms (buildPlatform, + hostPlatform, and targetPlatform; see + stage.nix or the manual). Actually, those identifiers are + purposefully not used here to draw a subtle but important distinction: While + the granularity of having 3 platforms is necessary to properly *build* + packages, it is overkill for specifying the user's *intent* when making a + build plan or package set. A simple "build vs deploy" dichotomy is adequate: + the sliding window principle described in the previous section shows how to + interpolate between the these two "end points" to get the 3 platform triple + for each bootstrapping stage. That means for any package a given package + set, even those not bound on the top level but only reachable via + dependencies or buildPackages, the three platforms will + be defined as one of localSystem or + crossSystem, with the former replacing the latter as one + traverses build-time dependencies. A last simple difference then is + crossSystem should be null when one doesn't want to + cross-compile, while the *Platforms are always non-null. + localSystem is always non-null. -
- +
- -
+
Cross-compilation infrastructure - To be written. - - If one explores nixpkgs, they will see derivations with names like gccCross. - Such *Cross derivations is a holdover from before we properly distinguished between the host and target platforms - —the derivation with "Cross" in the name covered the build = host != target case, while the other covered the host = target, with build platform the same or not based on whether one was using its .nativeDrv or .crossDrv. - This ugliness will disappear soon. - -
+ + To be written. + + + + + If one explores nixpkgs, they will see derivations with names like + gccCross. Such *Cross derivations is + a holdover from before we properly distinguished between the host and + target platforms —the derivation with "Cross" in the name covered the + build = host != target case, while the other covered the + host = target, with build platform the same or not based + on whether one was using its .nativeDrv or + .crossDrv. This ugliness will disappear soon. + + +
diff --git a/doc/default.nix b/doc/default.nix index e5be364506ff..0d95d3f04573 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -7,7 +7,7 @@ in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ]; + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ]; src = ./.; @@ -18,6 +18,7 @@ pkgs.stdenv.mkDerivation { HIGHLIGHTJS = pkgs.documentation-highlighter; XSL = "${pkgs.docbook5_xsl}/xml/xsl"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; + XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" diff --git a/doc/functions.xml b/doc/functions.xml index b2e450972947..cdae96703f13 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -1,144 +1,139 @@ - -Functions reference - - - The nixpkgs repository has several utility functions to manipulate Nix expressions. - - -
+ Functions reference + + The nixpkgs repository has several utility functions to manipulate Nix + expressions. + +
Overriding - Sometimes one wants to override parts of - nixpkgs, e.g. derivation attributes, the results of - derivations or even the whole package set. + Sometimes one wants to override parts of nixpkgs, e.g. + derivation attributes, the results of derivations or even the whole package + set.
- <pkg>.override + <pkg>.override - - The function override is usually available for all the - derivations in the nixpkgs expression (pkgs). - - - It is used to override the arguments passed to a function. - - - Example usages: + + The function override is usually available for all the + derivations in the nixpkgs expression (pkgs). + - pkgs.foo.override { arg1 = val1; arg2 = val2; ... } - import pkgs.path { overlays = [ (self: super: { + + It is used to override the arguments passed to a function. + + + + Example usages: +pkgs.foo.override { arg1 = val1; arg2 = val2; ... } +import pkgs.path { overlays = [ (self: super: { foo = super.foo.override { barSupport = true ; }; })]}; - mypkg = pkgs.callPackage ./mypkg.nix { +mypkg = pkgs.callPackage ./mypkg.nix { mydep = pkgs.mydep.override { ... }; } - - - - In the first example, pkgs.foo is the result of a function call - with some default arguments, usually a derivation. - Using pkgs.foo.override will call the same function with - the given new arguments. - + + + In the first example, pkgs.foo is the result of a + function call with some default arguments, usually a derivation. Using + pkgs.foo.override will call the same function with the + given new arguments. +
- <pkg>.overrideAttrs + <pkg>.overrideAttrs - - The function overrideAttrs allows overriding the - attribute set passed to a stdenv.mkDerivation call, - producing a new derivation based on the original one. - This function is available on all derivations produced by the - stdenv.mkDerivation function, which is most packages - in the nixpkgs expression pkgs. - + + The function overrideAttrs allows overriding the + attribute set passed to a stdenv.mkDerivation call, + producing a new derivation based on the original one. This function is + available on all derivations produced by the + stdenv.mkDerivation function, which is most packages in + the nixpkgs expression pkgs. + - - Example usage: - - helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { + + Example usage: +helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { separateDebugInfo = true; }); - + + + In the above example, the separateDebugInfo attribute is + overridden to be true, thus building debug info for + helloWithDebug, while all other attributes will be + retained from the original hello package. + + + + The argument oldAttrs is conventionally used to refer to + the attr set originally passed to stdenv.mkDerivation. + + + - In the above example, the separateDebugInfo attribute is - overridden to be true, thus building debug info for - helloWithDebug, while all other attributes will be - retained from the original hello package. + Note that separateDebugInfo is processed only by the + stdenv.mkDerivation function, not the generated, raw + Nix derivation. Thus, using overrideDerivation will not + work in this case, as it overrides only the attributes of the final + derivation. It is for this reason that overrideAttrs + should be preferred in (almost) all cases to + overrideDerivation, i.e. to allow using + sdenv.mkDerivation to process input arguments, as well + as the fact that it is easier to use (you can use the same attribute names + you see in your Nix code, instead of the ones generated (e.g. + buildInputs vs nativeBuildInputs, + and involves less typing. - - - The argument oldAttrs is conventionally used to refer to - the attr set originally passed to stdenv.mkDerivation. - - - - - Note that separateDebugInfo is processed only by the - stdenv.mkDerivation function, not the generated, raw - Nix derivation. Thus, using overrideDerivation will - not work in this case, as it overrides only the attributes of the final - derivation. It is for this reason that overrideAttrs - should be preferred in (almost) all cases to - overrideDerivation, i.e. to allow using - sdenv.mkDerivation to process input arguments, as well - as the fact that it is easier to use (you can use the same attribute - names you see in your Nix code, instead of the ones generated (e.g. - buildInputs vs nativeBuildInputs, - and involves less typing. - - - +
-
- <pkg>.overrideDerivation - - - You should prefer overrideAttrs in almost all - cases, see its documentation for the reasons why. - overrideDerivation is not deprecated and will continue - to work, but is less nice to use and does not have as many abilities as - overrideAttrs. - - - - - Do not use this function in Nixpkgs as it evaluates a Derivation - before modifying it, which breaks package abstraction and removes - error-checking of function arguments. In addition, this - evaluation-per-function application incurs a performance penalty, - which can become a problem if many overrides are used. - It is only intended for ad-hoc customisation, such as in - ~/.config/nixpkgs/config.nix. - - + <pkg>.overrideDerivation + - The function overrideDerivation creates a new derivation - based on an existing one by overriding the original's attributes with - the attribute set produced by the specified function. - This function is available on all - derivations defined using the makeOverridable function. - Most standard derivation-producing functions, such as - stdenv.mkDerivation, are defined using this - function, which means most packages in the nixpkgs expression, - pkgs, have this function. + You should prefer overrideAttrs in almost all cases, + see its documentation for the reasons why. + overrideDerivation is not deprecated and will continue + to work, but is less nice to use and does not have as many abilities as + overrideAttrs. + + - Example usage: + Do not use this function in Nixpkgs as it evaluates a Derivation before + modifying it, which breaks package abstraction and removes error-checking + of function arguments. In addition, this evaluation-per-function + application incurs a performance penalty, which can become a problem if + many overrides are used. It is only intended for ad-hoc customisation, + such as in ~/.config/nixpkgs/config.nix. + + - mySed = pkgs.gnused.overrideDerivation (oldAttrs: { + + The function overrideDerivation creates a new derivation + based on an existing one by overriding the original's attributes with the + attribute set produced by the specified function. This function is + available on all derivations defined using the + makeOverridable function. Most standard + derivation-producing functions, such as + stdenv.mkDerivation, are defined using this function, + which means most packages in the nixpkgs expression, + pkgs, have this function. + + + + Example usage: +mySed = pkgs.gnused.overrideDerivation (oldAttrs: { name = "sed-4.2.2-pre"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; @@ -146,98 +141,90 @@ }; patches = []; }); - + + + In the above example, the name, src, + and patches of the derivation will be overridden, while + all other attributes will be retained from the original derivation. + + + + The argument oldAttrs is used to refer to the attribute + set of the original derivation. + + + - In the above example, the name, src, - and patches of the derivation will be overridden, while - all other attributes will be retained from the original derivation. + A package's attributes are evaluated *before* being modified by the + overrideDerivation function. For example, the + name attribute reference in url = + "mirror://gnu/hello/${name}.tar.gz"; is filled-in *before* the + overrideDerivation function modifies the attribute set. + This means that overriding the name attribute, in this + example, *will not* change the value of the url + attribute. Instead, we need to override both the name + *and* url attributes. - - - The argument oldAttrs is used to refer to the attribute set of - the original derivation. - - - - - A package's attributes are evaluated *before* being modified by - the overrideDerivation function. - For example, the name attribute reference - in url = "mirror://gnu/hello/${name}.tar.gz"; - is filled-in *before* the overrideDerivation function - modifies the attribute set. This means that overriding the - name attribute, in this example, *will not* change the - value of the url attribute. Instead, we need to override - both the name *and* url attributes. - - - +
- lib.makeOverridable + lib.makeOverridable - - The function lib.makeOverridable is used to make the result - of a function easily customizable. This utility only makes sense for functions - that accept an argument set and return an attribute set. - + + The function lib.makeOverridable is used to make the + result of a function easily customizable. This utility only makes sense for + functions that accept an argument set and return an attribute set. + - - Example usage: - - f = { a, b }: { result = a+b; } + + Example usage: +f = { a, b }: { result = a+b; } c = lib.makeOverridable f { a = 1; b = 2; } + - - - - The variable c is the value of the f function - applied with some default arguments. Hence the value of c.result - is 3, in this example. - - - - The variable c however also has some additional functions, like - c.override which can be used to - override the default arguments. In this example the value of - (c.override { a = 4; }).result is 6. - + + The variable c is the value of the f + function applied with some default arguments. Hence the value of + c.result is 3, in this example. + + + The variable c however also has some additional + functions, like c.override which + can be used to override the default arguments. In this example the value of + (c.override { a = 4; }).result is 6. +
- -
- -
+
+
Generators - Generators are functions that create file formats from nix - data structures, e. g. for configuration files. - There are generators available for: INI, - JSON and YAML + Generators are functions that create file formats from nix data structures, + e. g. for configuration files. There are generators available for: + INI, JSON and YAML - All generators follow a similar call interface: generatorName - configFunctions data, where configFunctions is - an attrset of user-defined functions that format nested parts of the - content. - They each have common defaults, so often they do not need to be set - manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" - ] name) from the INI generator. It receives the - name of a section and sanitizes it. The default - mkSectionName escapes [ and - ] with a backslash. + All generators follow a similar call interface: generatorName + configFunctions data, where configFunctions is an + attrset of user-defined functions that format nested parts of the content. + They each have common defaults, so often they do not need to be set + manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" + ] name) from the INI generator. It receives the + name of a section and sanitizes it. The default + mkSectionName escapes [ and + ] with a backslash. - Generators can be fine-tuned to produce exactly the file format required - by your application/service. One example is an INI-file format which uses - : as separator, the strings - "yes"/"no" as boolean values - and requires all string values to be quoted: + Generators can be fine-tuned to produce exactly the file format required by + your application/service. One example is an INI-file format which uses + : as separator, the strings + "yes"/"no" as boolean values and + requires all string values to be quoted: @@ -270,7 +257,9 @@ in customToINI { } - This will produce the following INI file as nix string: + + This will produce the following INI file as nix string: + [main] @@ -284,111 +273,138 @@ str\:ange:"very::strange" merge:"diff3" - Nix store paths can be converted to strings by enclosing a - derivation attribute like so: "${drv}". + + + Nix store paths can be converted to strings by enclosing a derivation + attribute like so: "${drv}". + + - Detailed documentation for each generator can be found in - lib/generators.nix. + Detailed documentation for each generator can be found in + lib/generators.nix. - -
- -
+
+
Debugging Nix Expressions - Nix is a unityped, dynamic language, this means every value can - potentially appear anywhere. Since it is also non-strict, evaluation order - and what ultimately is evaluated might surprise you. Therefore it is important - to be able to debug nix expressions. + + Nix is a unityped, dynamic language, this means every value can potentially + appear anywhere. Since it is also non-strict, evaluation order and what + ultimately is evaluated might surprise you. Therefore it is important to be + able to debug nix expressions. + - - In the lib/debug.nix file you will find a number of - functions that help (pretty-)printing values while evaluation is runnnig. You - can even specify how deep these values should be printed recursively, and - transform them on the fly. Please consult the docstrings in - lib/debug.nix for usage information. -
- - -
+ + In the lib/debug.nix file you will find a number of + functions that help (pretty-)printing values while evaluation is runnnig. + You can even specify how deep these values should be printed recursively, + and transform them on the fly. Please consult the docstrings in + lib/debug.nix for usage information. + +
+
buildFHSUserEnv - buildFHSUserEnv provides a way to build and run - FHS-compatible lightweight sandboxes. It creates an isolated root with - bound /nix/store, so its footprint in terms of disk - space needed is quite small. This allows one to run software which is hard or - unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, - games distributed as tarballs, software with integrity checking and/or external - self-updated binaries. It uses Linux namespaces feature to create - temporary lightweight environments which are destroyed after all child - processes exit, without root user rights requirement. Accepted arguments are: + buildFHSUserEnv provides a way to build and run + FHS-compatible lightweight sandboxes. It creates an isolated root with bound + /nix/store, so its footprint in terms of disk space + needed is quite small. This allows one to run software which is hard or + unfeasible to patch for NixOS -- 3rd-party source trees with FHS + assumptions, games distributed as tarballs, software with integrity checking + and/or external self-updated binaries. It uses Linux namespaces feature to + create temporary lightweight environments which are destroyed after all + child processes exit, without root user rights requirement. Accepted + arguments are: - - name - - Environment name. - - - - targetPkgs - - Packages to be installed for the main host's architecture - (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also - installed. - - - - multiPkgs - - Packages to be installed for all architectures supported by - a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are - installed by default. - - - - extraBuildCommands - - Additional commands to be executed for finalizing the - directory structure. - - - - extraBuildCommandsMulti - - Like extraBuildCommands, but - executed only on multilib architectures. - - - - extraOutputsToInstall - - Additional derivation outputs to be linked for both - target and multi-architecture packages. - - - - extraInstallCommands - - Additional commands to be executed for finalizing the - derivation with runner script. - - - - runScript - - A command that would be executed inside the sandbox and - passed all the command line arguments. It defaults to - bash. - + + name + + + + Environment name. + + + + + targetPkgs + + + + Packages to be installed for the main host's architecture (i.e. x86_64 on + x86_64 installations). Along with libraries binaries are also installed. + + + + + multiPkgs + + + + Packages to be installed for all architectures supported by a host (i.e. + i686 and x86_64 on x86_64 installations). Only libraries are installed by + default. + + + + + extraBuildCommands + + + + Additional commands to be executed for finalizing the directory + structure. + + + + + extraBuildCommandsMulti + + + + Like extraBuildCommands, but executed only on multilib + architectures. + + + + + extraOutputsToInstall + + + + Additional derivation outputs to be linked for both target and + multi-architecture packages. + + + + + extraInstallCommands + + + + Additional commands to be executed for finalizing the derivation with + runner script. + + + + + runScript + + + + A command that would be executed inside the sandbox and passed all the + command line arguments. It defaults to bash. + + + - One can create a simple environment using a shell.nix - like that: + One can create a simple environment using a shell.nix + like that: - Running nix-shell would then drop you into a shell with - these libraries and binaries available. You can use this to run - closed-source applications which expect FHS structure without hassles: - simply change runScript to the application path, - e.g. ./bin/start.sh -- relative paths are supported. + Running nix-shell would then drop you into a shell with + these libraries and binaries available. You can use this to run + closed-source applications which expect FHS structure without hassles: + simply change runScript to the application path, e.g. + ./bin/start.sh -- relative paths are supported. -
- -
-pkgs.dockerTools - - - pkgs.dockerTools is a set of functions for creating and - manipulating Docker images according to the - - Docker Image Specification v1.2.0 - . Docker itself is not used to perform any of the operations done by these - functions. - - - - - The dockerTools API is unstable and may be subject to - backwards-incompatible changes in the future. - - - -
- buildImage +
+
+ pkgs.dockerTools - This function is analogous to the docker build command, - in that can used to build a Docker-compatible repository tarball containing - a single image with one or multiple layers. As such, the result - is suitable for being loaded in Docker with docker load. + pkgs.dockerTools is a set of functions for creating and + manipulating Docker images according to the + + Docker Image Specification v1.2.0 . Docker itself is not used to + perform any of the operations done by these functions. - - The parameters of buildImage with relative example values are - described below: - + + + The dockerTools API is unstable and may be subject to + backwards-incompatible changes in the future. + + - Docker build - +
+ buildImage + + + This function is analogous to the docker build command, + in that can used to build a Docker-compatible repository tarball containing + a single image with one or multiple layers. As such, the result is suitable + for being loaded in Docker with docker load. + + + + The parameters of buildImage with relative example + values are described below: + + + + Docker build + buildImage { name = "redis"; tag = "latest"; @@ -480,238 +495,217 @@ merge:"diff3" }; } - + - The above example will build a Docker image redis/latest - from the given base image. Loading and running this image in Docker results in - redis-server being started automatically. - + + The above example will build a Docker image redis/latest + from the given base image. Loading and running this image in Docker results + in redis-server being started automatically. + - - + + + + name specifies the name of the resulting image. This + is the only required argument for buildImage. + + + + + tag specifies the tag of the resulting image. By + default it's latest. + + + + + fromImage is the repository tarball containing the + base image. It must be a valid Docker image, such as exported by + docker save. By default it's null, + which can be seen as equivalent to FROM scratch of a + Dockerfile. + + + + + fromImageName can be used to further specify the base + image within the repository, in case it contains multiple images. By + default it's null, in which case + buildImage will peek the first image available in the + repository. + + + + + fromImageTag can be used to further specify the tag of + the base image within the repository, in case an image contains multiple + tags. By default it's null, in which case + buildImage will peek the first tag available for the + base image. + + + + + contents is a derivation that will be copied in the + new layer of the resulting image. This can be similarly seen as + ADD contents/ / in a Dockerfile. + By default it's null. + + + + + runAsRoot is a bash script that will run as root in an + environment that overlays the existing layers of the base image with the + new resulting layer, including the previously copied + contents derivation. This can be similarly seen as + RUN ... in a Dockerfile. + + + Using this parameter requires the kvm device to be + available. + + + + + + + config is used to specify the configuration of the + containers that will be started off the built image in Docker. The + available options are listed in the + + Docker Image Specification v1.2.0 . + + + + + + After the new layer has been created, its closure (to which + contents, config and + runAsRoot contribute) will be copied in the layer + itself. Only new dependencies that are not already in the existing layers + will be copied. + + + + At the end of the process, only one new single layer will be produced and + added to the resulting image. + + + + The resulting repository will only list the single image + image/tag. In the case of + it would be + redis/latest. + + + + It is possible to inspect the arguments with which an image was built using + its buildArgs attribute. + + + - name specifies the name of the resulting image. - This is the only required argument for buildImage. + If you see errors similar to getProtocolByName: does not exist + (no such protocol name: tcp) you may need to add + pkgs.iana-etc to contents. - + - + - tag specifies the tag of the resulting image. - By default it's latest. + If you see errors similar to Error_Protocol ("certificate has + unknown CA",True,UnknownCa) you may need to add + pkgs.cacert to contents. - + +
- - - fromImage is the repository tarball containing the base image. - It must be a valid Docker image, such as exported by docker save. - By default it's null, which can be seen as equivalent - to FROM scratch of a Dockerfile. - - +
+ pullImage - - - fromImageName can be used to further specify - the base image within the repository, in case it contains multiple images. - By default it's null, in which case - buildImage will peek the first image available - in the repository. - - + + This function is analogous to the docker pull command, + in that can be used to pull a Docker image from a Docker registry. + By default Docker Hub + is used to pull images. + - - - fromImageTag can be used to further specify the tag - of the base image within the repository, in case an image contains multiple tags. - By default it's null, in which case - buildImage will peek the first tag available for the base image. - - + + Its parameters are described in the example below: + - - - contents is a derivation that will be copied in the new - layer of the resulting image. This can be similarly seen as - ADD contents/ / in a Dockerfile. - By default it's null. - - - - - - runAsRoot is a bash script that will run as root - in an environment that overlays the existing layers of the base image with - the new resulting layer, including the previously copied - contents derivation. - This can be similarly seen as - RUN ... in a Dockerfile. - - - - Using this parameter requires the kvm - device to be available. - - - - - - - - config is used to specify the configuration of the - containers that will be started off the built image in Docker. - The available options are listed in the - - Docker Image Specification v1.2.0 - . - - - - - - - After the new layer has been created, its closure - (to which contents, config and - runAsRoot contribute) will be copied in the layer itself. - Only new dependencies that are not already in the existing layers will be copied. - - - - At the end of the process, only one new single layer will be produced and - added to the resulting image. - - - - The resulting repository will only list the single image - image/tag. In the case of - it would be redis/latest. - - - - It is possible to inspect the arguments with which an image was built - using its buildArgs attribute. - - - - - - - If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp) - you may need to add pkgs.iana-etc to contents. - - - - - - If you see errors similar to Error_Protocol ("certificate has unknown CA",True,UnknownCa) - you may need to add pkgs.cacert to contents. - - - -
- -
- pullImage - - - This function is analogous to the docker pull command, - in that can be used to fetch a Docker image from a Docker registry. - Currently only registry v1 is supported. - By default Docker Hub - is used to pull images. - - - - Its parameters are described in the example below: - - - Docker pull - + + Docker pull + pullImage { - imageName = "debian"; - imageTag = "jessie"; - imageId = null; - sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; - - indexUrl = "https://index.docker.io"; - registryVersion = "v1"; + imageName = "nixos/nix"; + imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + finalImageTag = "1.11"; + sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; } - + - - + + + + imageName specifies the name of the image to be downloaded, + which can also include the registry namespace (e.g. nixos). + This argument is required. + + + + + imageDigest specifies the digest of the image + to be downloaded. Skopeo can be used to get the digest of an image + + $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' + sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b + + This argument is required. + + + + + finalImageTag, if specified, this is the tag of + the image to be created. Note it is never used to fetch the image + since we prefer to rely on the immutable digest ID. By default + it's latest. + + + + + sha256 is the checksum of the whole fetched image. + This argument is required. + + + +
+ +
+ exportImage + + + This function is analogous to the docker export command, + in that can used to flatten a Docker image that contains multiple layers. + It is in fact the result of the merge of all the layers of the image. As + such, the result is suitable for being imported in Docker with + docker import. + + + - imageName specifies the name of the image to be downloaded, - which can also include the registry namespace (e.g. library/debian). - This argument is required. + Using this function requires the kvm device to be + available. - + - - - imageTag specifies the tag of the image to be downloaded. - By default it's latest. - - + + The parameters of exportImage are the following: + - - - imageId, if specified this exact image will be fetched, instead - of imageName/imageTag. However, the resulting repository - will still be named imageName/imageTag. - By default it's null. - - - - - - sha256 is the checksum of the whole fetched image. - This argument is required. - - - - The checksum is computed on the unpacked directory, not on the final tarball. - - - - - - - In the above example the default values are shown for the variables - indexUrl and registryVersion. - Hence by default the Docker.io registry is used to pull the images. - - - - -
- -
- exportImage - - - This function is analogous to the docker export command, - in that can used to flatten a Docker image that contains multiple layers. - It is in fact the result of the merge of all the layers of the image. - As such, the result is suitable for being imported in Docker - with docker import. - - - - - Using this function requires the kvm - device to be available. - - - - - The parameters of exportImage are the following: - - - Docker export - + + Docker export + exportImage { fromImage = someLayeredImage; fromImageName = null; @@ -720,33 +714,35 @@ merge:"diff3" name = someLayeredImage.name; } - + - - The parameters relative to the base image have the same synopsis as - described in , except that - fromImage is the only required argument in this case. - + + The parameters relative to the base image have the same synopsis as + described in , except + that fromImage is the only required argument in this + case. + - - The name argument is the name of the derivation output, - which defaults to fromImage.name. - -
+ + The name argument is the name of the derivation output, + which defaults to fromImage.name. + +
-
- shadowSetup +
+ shadowSetup - - This constant string is a helper for setting up the base files for managing - users and groups, only if such files don't exist already. - It is suitable for being used in a - runAsRoot script for cases like - in the example below: - + + This constant string is a helper for setting up the base files for managing + users and groups, only if such files don't exist already. It is suitable + for being used in a runAsRoot + script for cases like + in the example below: + - Shadow base files - + + Shadow base files + buildImage { name = "shadow-basic"; @@ -760,16 +756,13 @@ merge:"diff3" ''; } - - - - Creating base files like /etc/passwd or - /etc/login.defs are necessary for shadow-utils to - manipulate users and groups. - - -
- -
+ + + Creating base files like /etc/passwd or + /etc/login.defs are necessary for shadow-utils to + manipulate users and groups. + +
+
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 1a18ed27237c..ac7a83ed4265 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -1,124 +1,137 @@
+ BEAM Languages (Erlang, Elixir & LFE) - BEAM Languages (Erlang, Elixir & LFE) -
- Introduction - - In this document and related Nix expressions, we use the term, - BEAM, to describe the environment. BEAM is the name - of the Erlang Virtual Machine and, as far as we're concerned, from a - packaging perspective, all languages that run on the BEAM are - interchangeable. That which varies, like the build system, is transparent - to users of any given BEAM package, so we make no distinction. - -
-
- Structure - - All BEAM-related expressions are available via the top-level - beam attribute, which includes: - - - - - interpreters: a set of compilers running on the - BEAM, including multiple Erlang/OTP versions - (beam.interpreters.erlangR19, etc), Elixir - (beam.interpreters.elixir) and LFE - (beam.interpreters.lfe). - - - - - packages: a set of package sets, each compiled with - a specific Erlang/OTP version, e.g. - beam.packages.erlangR19. - - - - - The default Erlang compiler, defined by - beam.interpreters.erlang, is aliased as - erlang. The default BEAM package set is defined by - beam.packages.erlang and aliased at the top level as - beamPackages. - - - To create a package set built with a custom Erlang version, use the - lambda, beam.packagesWith, which accepts an Erlang/OTP - derivation and produces a package set similar to - beam.packages.erlang. - - - Many Erlang/OTP distributions available in - beam.interpreters have versions with ODBC and/or Java - enabled. For example, there's - beam.interpreters.erlangR19_odbc_javac, which - corresponds to beam.interpreters.erlangR19. - - - We also provide the lambda, - beam.packages.erlang.callPackage, which simplifies - writing BEAM package definitions by injecting all packages from - beam.packages.erlang into the top-level context. - -
-
- Build Tools -
- Rebar3 - - By default, Rebar3 wants to manage its own dependencies. This is perfectly - acceptable in the normal, non-Nix setup, but in the Nix world, it is not. - To rectify this, we provide two versions of Rebar3: - - - - rebar3: patched to remove the ability to download - anything. When not running it via nix-shell or - nix-build, it's probably not going to work as - desired. - - - - - rebar3-open: the normal, unmodified Rebar3. It - should work exactly as would any other version of Rebar3. Any Erlang - package should rely on rebar3 instead. See . - - - - -
-
- Mix & Erlang.mk - - Both Mix and Erlang.mk work exactly as expected. There is a bootstrap - process that needs to be run for both, however, which is supported by the - buildMix and buildErlangMk - derivations, respectively. - -
-
+
+ Introduction -
- How to Install BEAM Packages - BEAM packages are not registered at the top level, simply because they are - not relevant to the vast majority of Nix users. They are installable using - the beam.packages.erlang attribute set (aliased as - beamPackages), which points to packages built by the - default Erlang/OTP version in Nixpkgs, as defined by - beam.interpreters.erlang. + In this document and related Nix expressions, we use the term, + BEAM, to describe the environment. BEAM is the name of + the Erlang Virtual Machine and, as far as we're concerned, from a packaging + perspective, all languages that run on the BEAM are interchangeable. That + which varies, like the build system, is transparent to users of any given + BEAM package, so we make no distinction. + +
- To list the available packages in - beamPackages, use the following command: +
+ Structure + + + All BEAM-related expressions are available via the top-level + beam attribute, which includes: - + + + + interpreters: a set of compilers running on the BEAM, + including multiple Erlang/OTP versions + (beam.interpreters.erlangR19, etc), Elixir + (beam.interpreters.elixir) and LFE + (beam.interpreters.lfe). + + + + + packages: a set of package sets, each compiled with a + specific Erlang/OTP version, e.g. + beam.packages.erlangR19. + + + + + + The default Erlang compiler, defined by + beam.interpreters.erlang, is aliased as + erlang. The default BEAM package set is defined by + beam.packages.erlang and aliased at the top level as + beamPackages. + + + + To create a package set built with a custom Erlang version, use the lambda, + beam.packagesWith, which accepts an Erlang/OTP derivation + and produces a package set similar to + beam.packages.erlang. + + + + Many Erlang/OTP distributions available in + beam.interpreters have versions with ODBC and/or Java + enabled. For example, there's + beam.interpreters.erlangR19_odbc_javac, which corresponds + to beam.interpreters.erlangR19. + + + + We also provide the lambda, + beam.packages.erlang.callPackage, which simplifies + writing BEAM package definitions by injecting all packages from + beam.packages.erlang into the top-level context. + +
+ +
+ Build Tools + +
+ Rebar3 + + + By default, Rebar3 wants to manage its own dependencies. This is perfectly + acceptable in the normal, non-Nix setup, but in the Nix world, it is not. + To rectify this, we provide two versions of Rebar3: + + + + rebar3: patched to remove the ability to download + anything. When not running it via nix-shell or + nix-build, it's probably not going to work as + desired. + + + + + rebar3-open: the normal, unmodified Rebar3. It should + work exactly as would any other version of Rebar3. Any Erlang package + should rely on rebar3 instead. See + . + + + + +
+ +
+ Mix & Erlang.mk + + + Both Mix and Erlang.mk work exactly as expected. There is a bootstrap + process that needs to be run for both, however, which is supported by the + buildMix and buildErlangMk + derivations, respectively. + +
+
+ +
+ How to Install BEAM Packages + + + BEAM packages are not registered at the top level, simply because they are + not relevant to the vast majority of Nix users. They are installable using + the beam.packages.erlang attribute set (aliased as + beamPackages), which points to packages built by the + default Erlang/OTP version in Nixpkgs, as defined by + beam.interpreters.erlang. To list the available packages + in beamPackages, use the following command: + + + $ nix-env -f "<nixpkgs>" -qaP -A beamPackages beamPackages.esqlite esqlite-0.2.1 beamPackages.goldrush goldrush-0.1.7 @@ -128,34 +141,43 @@ beamPackages.lager lager-3.0.2 beamPackages.meck meck-0.8.3 beamPackages.rebar3-pc pc-1.1.0 + - To install any of those packages into your profile, refer to them by their - attribute path (first column): + To install any of those packages into your profile, refer to them by their + attribute path (first column): - + + $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse + - The attribute path of any BEAM package corresponds to the name of that - particular package in Hex or its - OTP Application/Release name. + The attribute path of any BEAM package corresponds to the name of that + particular package in Hex or its + OTP Application/Release name. -
-
+
+ +
Packaging BEAM Applications +
- Erlang Applications -
- Rebar3 Packages - - The Nix function, buildRebar3, defined in - beam.packages.erlang.buildRebar3 and aliased at the - top level, can be used to build a derivation that understands how to - build a Rebar3 project. For example, we can build hex2nix as - follows: - - + Erlang Applications + +
+ Rebar3 Packages + + + The Nix function, buildRebar3, defined in + beam.packages.erlang.buildRebar3 and aliased at the top + level, can be used to build a derivation that understands how to build a + Rebar3 project. For example, we can build + hex2nix + as follows: + + + { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: buildRebar3 rec { @@ -172,33 +194,40 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse beamDeps = [ ibrowse jsx erlware_commons ]; } - - Such derivations are callable with - beam.packages.erlang.callPackage (see ). To call this package using the normal - callPackage, refer to dependency packages via - beamPackages, e.g. - beamPackages.ibrowse. - - - Notably, buildRebar3 includes - beamDeps, while - stdenv.mkDerivation does not. BEAM dependencies added - there will be correctly handled by the system. - - - If a package needs to compile native code via Rebar3's port compilation - mechanism, add compilePort = true; to the derivation. - -
-
- Erlang.mk Packages - - Erlang.mk functions similarly to Rebar3, except we use - buildErlangMk instead of - buildRebar3. - - + + + Such derivations are callable with + beam.packages.erlang.callPackage (see + ). To call this package using + the normal callPackage, refer to dependency packages + via beamPackages, e.g. + beamPackages.ibrowse. + + + + Notably, buildRebar3 includes + beamDeps, while stdenv.mkDerivation + does not. BEAM dependencies added there will be correctly handled by the + system. + + + + If a package needs to compile native code via Rebar3's port compilation + mechanism, add compilePort = true; to the derivation. + +
+ +
+ Erlang.mk Packages + + + Erlang.mk functions similarly to Rebar3, except we use + buildErlangMk instead of + buildRebar3. + + + { buildErlangMk, fetchHex, cowlib, ranch }: buildErlangMk { @@ -222,14 +251,17 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse }; } -
-
- Mix Packages - - Mix functions similarly to Rebar3, except we use - buildMix instead of buildRebar3. - - +
+ +
+ Mix Packages + + + Mix functions similarly to Rebar3, except we use + buildMix instead of buildRebar3. + + + { buildMix, fetchHex, plug, absinthe }: buildMix { @@ -253,10 +285,12 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse }; } - - Alternatively, we can use buildHex as a shortcut: - - + + + Alternatively, we can use buildHex as a shortcut: + + + { buildHex, buildMix, plug, absinthe }: buildHex { @@ -278,21 +312,25 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse }; } -
+
-
-
+
+ +
How to Develop +
- Accessing an Environment - - Often, we simply want to access a valid environment that contains a - specific package and its dependencies. We can accomplish that with the - env attribute of a derivation. For example, let's say - we want to access an Erlang REPL with ibrowse loaded - up. We could do the following: - - + Accessing an Environment + + + Often, we simply want to access a valid environment that contains a + specific package and its dependencies. We can accomplish that with the + env attribute of a derivation. For example, let's say we + want to access an Erlang REPL with ibrowse loaded up. We + could do the following: + + + $ nix-shell -A beamPackages.ibrowse.env --run "erl" Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] @@ -333,22 +371,25 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse ok 2> - - Notice the -A beamPackages.ibrowse.env. That is the key - to this functionality. - + + + Notice the -A beamPackages.ibrowse.env. That is the key + to this functionality. +
+
- Creating a Shell - - Getting access to an environment often isn't enough to do real - development. Usually, we need to create a shell.nix - file and do our development inside of the environment specified therein. - This file looks a lot like the packaging described above, except that - src points to the project root and we call the package - directly. - - + Creating a Shell + + + Getting access to an environment often isn't enough to do real development. + Usually, we need to create a shell.nix file and do our + development inside of the environment specified therein. This file looks a + lot like the packaging described above, except that src + points to the project root and we call the package directly. + + + { pkgs ? import "<nixpkgs"> {} }: with pkgs; @@ -368,13 +409,16 @@ in drv -
+ +
Building in a Shell (for Mix Projects) + - We can leverage the support of the derivation, irrespective of the build - derivation, by calling the commands themselves. + We can leverage the support of the derivation, irrespective of the build + derivation, by calling the commands themselves. - + + # ============================================================================= # Variables # ============================================================================= @@ -431,44 +475,54 @@ analyze: build plt $(NIX_SHELL) --run "mix dialyzer --no-compile" + - Using a shell.nix as described (see shell.nix as described (see + ) should just work. Aside from - test, plt, and - analyze, the Make targets work just fine for all of the - build derivations. + test, plt, and + analyze, the Make targets work just fine for all of the + build derivations. +
-
-
-
+
+ +
Generating Packages from Hex with <literal>hex2nix</literal> + - Updating the Hex package set - requires hex2nix. Given the - path to the Erlang modules (usually - pkgs/development/erlang-modules), it will dump a file - called hex-packages.nix, containing all the packages that - use a recognized build system in Hex. It can't be determined, however, - whether every package is buildable. - - - To make life easier for our users, try to build every Hex package and remove those that fail. - To do that, simply run the following command in the root of your - nixpkgs repository: - - + Updating the Hex package set + requires + hex2nix. + Given the path to the Erlang modules (usually + pkgs/development/erlang-modules), it will dump a file + called hex-packages.nix, containing all the packages that + use a recognized build system in + Hex. It can't be determined, + however, whether every package is buildable. + + + + To make life easier for our users, try to build every + Hex package and remove those + that fail. To do that, simply run the following command in the root of your + nixpkgs repository: + + + $ nix-build -A beamPackages - - That will attempt to build every package in - beamPackages. Then manually remove those that fail. - Hopefully, someone will improve hex2nix in the - future to automate the process. - -
+ + + That will attempt to build every package in beamPackages. + Then manually remove those that fail. Hopefully, someone will improve + hex2nix + in the future to automate the process. + +
diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml index 742d3c2e9fe5..db7536cdc14e 100644 --- a/doc/languages-frameworks/bower.xml +++ b/doc/languages-frameworks/bower.xml @@ -1,40 +1,37 @@
+ Bower -Bower + + Bower is a package manager for web + site front-end components. Bower packages (comprising of build artefacts and + sometimes sources) are stored in git repositories, + typically on Github. The package registry is run by the Bower team with + package metadata coming from the bower.json file within + each package. + - - Bower is a package manager - for web site front-end components. Bower packages (comprising of - build artefacts and sometimes sources) are stored in - git repositories, typically on Github. The - package registry is run by the Bower team with package metadata - coming from the bower.json file within each - package. - + + The end result of running Bower is a bower_components + directory which can be included in the web app's build process. + - - The end result of running Bower is a - bower_components directory which can be included - in the web app's build process. - - - + Bower can be run interactively, by installing nodePackages.bower. More interestingly, the Bower components can be declared in a Nix derivation, with the help of nodePackages.bower2nix. - + -
+
<command>bower2nix</command> usage - - Suppose you have a bower.json with the following contents: - - -<filename>bower.json</filename> + + Suppose you have a bower.json with the following + contents: + + <filename>bower.json</filename> - - - - - - Running bower2nix will produce something like the - following output: + + + + Running bower2nix will produce something like the + following output: - - - - - Using the bower2nix command line arguments, the - output can be redirected to a file. A name like - bower-packages.nix would be fine. - - - - The resulting derivation is a union of all the downloaded Bower - packages (and their dependencies). To use it, they still need to be - linked together by Bower, which is where - buildBowerComponents is useful. - -
- -
<varname>buildBowerComponents</varname> function + - The function is implemented in - pkgs/development/bower-modules/generic/default.nix. - Example usage: + Using the bower2nix command line arguments, the output + can be redirected to a file. A name like + bower-packages.nix would be fine. + -buildBowerComponents + + The resulting derivation is a union of all the downloaded Bower packages + (and their dependencies). To use it, they still need to be linked together + by Bower, which is where buildBowerComponents is useful. + +
+ +
+ <varname>buildBowerComponents</varname> function + + + The function is implemented in + + pkgs/development/bower-modules/generic/default.nix. + Example usage: + + buildBowerComponents bowerComponents = buildBowerComponents { name = "my-web-app"; @@ -92,42 +87,42 @@ bowerComponents = buildBowerComponents { src = myWebApp; }; - + - -In , the following arguments -are of special significance to the function: + + In , the following arguments are + of special significance to the function: + + + + generated specifies the file which was created by + bower2nix. + + + + + src is your project's sources. It needs to contain a + bower.json file. + + + + - - - - generated specifies the file which was created by bower2nix. - - + + buildBowerComponents will run Bower to link together the + output of bower2nix, resulting in a + bower_components directory which can be used. + - - - src is your project's sources. It needs to - contain a bower.json file. - - - - + + Here is an example of a web frontend build process using + gulp. You might use grunt, or anything + else. + - - buildBowerComponents will run Bower to link - together the output of bower2nix, resulting in a - bower_components directory which can be used. - - - - Here is an example of a web frontend build process using - gulp. You might use grunt, or - anything else. - - -Example build script (<filename>gulpfile.js</filename>) + + Example build script (<filename>gulpfile.js</filename>) - + - - Full example — <filename>default.nix</filename> + + Full example — <filename>default.nix</filename> { myWebApp ? { outPath = ./.; name = "myWebApp"; } , pkgs ? import <nixpkgs> {} @@ -172,73 +167,63 @@ pkgs.stdenv.mkDerivation { installPhase = "mv gulpdist $out"; } - + - -A few notes about : - - - - - The result of buildBowerComponents is an - input to the frontend build. - - - - - - Whether to symlink or copy the - bower_components directory depends on the - build tool in use. In this case a copy is used to avoid - gulp silliness with permissions. - - - - - - gulp requires HOME to - refer to a writeable directory. - - - - - + + A few notes about : + + + + The result of buildBowerComponents is an input to the + frontend build. + + + + + Whether to symlink or copy the bower_components + directory depends on the build tool in use. In this case a copy is used + to avoid gulp silliness with permissions. + + + + + gulp requires HOME to refer to a + writeable directory. + + + + The actual build command. Other tools could be used. - - - - -
+ + + + +
-
+
Troubleshooting - - - - - ENOCACHE errors from + + + ENOCACHE errors from buildBowerComponents - - This means that Bower was looking for a package version which - doesn't exist in the generated - bower-packages.nix. - - - If bower.json has been updated, then run - bower2nix again. - - - It could also be a bug in bower2nix or - fetchbower. If possible, try reformulating - the version specification in bower.json. - + + This means that Bower was looking for a package version which doesn't + exist in the generated bower-packages.nix. + + + If bower.json has been updated, then run + bower2nix again. + + + It could also be a bug in bower2nix or + fetchbower. If possible, try reformulating the version + specification in bower.json. + - - - -
- + + +
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index 0ce1abd6194c..d5f2574039f2 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -1,36 +1,38 @@
+ Coq -Coq - - Coq libraries should be installed in - $(out)/lib/coq/${coq.coq-version}/user-contrib/. - Such directories are automatically added to the - $COQPATH environment variable by the hook defined - in the Coq derivation. - - - Some libraries require OCaml and sometimes also Camlp5 or findlib. - The exact versions that were used to build Coq are saved in the - coq.ocaml and coq.camlp5 - and coq.findlib attributes. - - - Coq libraries may be compatible with some specific versions of Coq only. - The compatibleCoqVersions attribute is used to - precisely select those versions of Coq that are compatible with this - derivation. - - - Here is a simple package example. It is a pure Coq library, thus it - depends on Coq. It builds on the Mathematical Components library, thus it - also takes mathcomp as buildInputs. - Its Makefile has been generated using - coq_makefile so we only have to - set the $COQLIB variable at install time. - - + + Coq libraries should be installed in + $(out)/lib/coq/${coq.coq-version}/user-contrib/. Such + directories are automatically added to the $COQPATH + environment variable by the hook defined in the Coq derivation. + + + + Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact + versions that were used to build Coq are saved in the + coq.ocaml and coq.camlp5 and + coq.findlib attributes. + + + + Coq libraries may be compatible with some specific versions of Coq only. The + compatibleCoqVersions attribute is used to precisely + select those versions of Coq that are compatible with this derivation. + + + + Here is a simple package example. It is a pure Coq library, thus it depends + on Coq. It builds on the Mathematical Components library, thus it also takes + mathcomp as buildInputs. Its + Makefile has been generated using + coq_makefile so we only have to set the + $COQLIB variable at install time. + + + { stdenv, fetchFromGitHub, coq, mathcomp }: stdenv.mkDerivation rec { diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 54ea60c90212..ab4c9f0f7c88 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -1,14 +1,14 @@
+ Go -Go + + The function buildGoPackage builds standard Go programs. + -The function buildGoPackage builds -standard Go programs. - - -buildGoPackage + + buildGoPackage deis = buildGoPackage rec { name = "deis-${version}"; @@ -29,55 +29,56 @@ deis = buildGoPackage rec { buildFlags = "--tags release"; } - + - is an example expression using buildGoPackage, -the following arguments are of special significance to the function: - - - - + + is an example expression using + buildGoPackage, the following arguments are of special significance to the + function: + + - goPackagePath specifies the package's canonical Go import path. + goPackagePath specifies the package's canonical Go + import path. - - - + + - subPackages limits the builder from building child packages that - have not been listed. If subPackages is not specified, all child - packages will be built. + subPackages limits the builder from building child + packages that have not been listed. If subPackages is + not specified, all child packages will be built. - In this example only github.com/deis/deis/client will be built. + In this example only github.com/deis/deis/client will + be built. - - - + + - goDeps is where the Go dependencies of a Go program are listed - as a list of package source identified by Go import path. - It could be imported as a separate deps.nix file for - readability. The dependency data structure is described below. + goDeps is where the Go dependencies of a Go program are + listed as a list of package source identified by Go import path. It could + be imported as a separate deps.nix file for + readability. The dependency data structure is described below. - - - + + - buildFlags is a list of flags passed to the go build command. + buildFlags is a list of flags passed to the go build + command. - + + + - + + The goDeps attribute can be imported from a separate + nix file that defines which Go libraries are needed and + should be included in GOPATH for + buildPhase. + - - -The goDeps attribute can be imported from a separate - nix file that defines which Go libraries are needed and should - be included in GOPATH for buildPhase. - - -deps.nix + + deps.nix [ { @@ -100,67 +101,60 @@ the following arguments are of special significance to the function: } ] - + - - - - - + + + - goDeps is a list of Go dependencies. + goDeps is a list of Go dependencies. - - - + + - goPackagePath specifies Go package import path. + goPackagePath specifies Go package import path. - - - + + - fetch type that needs to be used to get package source. If git - is used there should be url, rev and sha256 - defined next to it. + fetch type that needs to be used to get package source. + If git is used there should be url, + rev and sha256 defined next to it. - + + + - + + To extract dependency information from a Go package in automated way use + go2nix. It can + produce complete derivation and goDeps file for Go + programs. + - - -To extract dependency information from a Go package in automated way use go2nix. - It can produce complete derivation and goDeps file for Go programs. - - - buildGoPackage produces - where bin includes program binaries. You can test build a Go binary as follows: - - + + buildGoPackage produces + where + bin includes program binaries. You can test build a Go + binary as follows: + $ nix-build -A deis.bin - or build all outputs with: - - + $ nix-build -A deis.all + bin output will be installed by default with + nix-env -i or systemPackages. + - bin output will be installed by default with nix-env -i - or systemPackages. - - - - -You may use Go packages installed into the active Nix profiles by adding -the following to your ~/.bashrc: - + + You may use Go packages installed into the active Nix profiles by adding the + following to your ~/.bashrc: for p in $NIX_PROFILES; do GOPATH="$p/share/go:$GOPATH" done - - +
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index a1c265f67484..f22984cb56b0 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -1,36 +1,31 @@ - -Support for specific programming languages and frameworks - -The standard build -environment makes it easy to build typical Autotools-based -packages with very little code. Any other kind of package can be -accomodated by overriding the appropriate phases of -stdenv. However, there are specialised functions -in Nixpkgs to easily build packages for other programming languages, -such as Perl or Haskell. These are described in this chapter. - - - - - - - - - - - - - - - - - - - - - - + Support for specific programming languages and frameworks + + The standard build environment makes it + easy to build typical Autotools-based packages with very little code. Any + other kind of package can be accomodated by overriding the appropriate phases + of stdenv. However, there are specialised functions in + Nixpkgs to easily build packages for other programming languages, such as + Perl or Haskell. These are described in this chapter. + + + + + + + + + + + + + + + + + + + diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 2507cc2c469a..dcf4d17fa57d 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -1,11 +1,10 @@
+ Java -Java - -Ant-based Java packages are typically built from source as follows: - + + Ant-based Java packages are typically built from source as follows: stdenv.mkDerivation { name = "..."; @@ -16,33 +15,33 @@ stdenv.mkDerivation { buildPhase = "ant"; } + Note that jdk is an alias for the OpenJDK. + -Note that jdk is an alias for the OpenJDK. - -JAR files that are intended to be used by other packages should -be installed in $out/share/java. The OpenJDK has -a stdenv setup hook that adds any JARs in the -share/java directories of the build inputs to the -CLASSPATH environment variable. For instance, if the -package libfoo installs a JAR named -foo.jar in its share/java -directory, and another package declares the attribute - + + JAR files that are intended to be used by other packages should be installed + in $out/share/java. The OpenJDK has a stdenv setup hook + that adds any JARs in the share/java directories of the + build inputs to the CLASSPATH environment variable. For + instance, if the package libfoo installs a JAR named + foo.jar in its share/java + directory, and another package declares the attribute buildInputs = [ jdk libfoo ]; + then CLASSPATH will be set to + /nix/store/...-libfoo/share/java/foo.jar. + -then CLASSPATH will be set to -/nix/store/...-libfoo/share/java/foo.jar. - -Private JARs -should be installed in a location like -$out/share/package-name. - -If your Java package provides a program, you need to generate a -wrapper script to run it using the OpenJRE. You can use -makeWrapper for this: + + Private JARs should be installed in a location like + $out/share/package-name. + + + If your Java package provides a program, you need to generate a wrapper + script to run it using the OpenJRE. You can use + makeWrapper for this: buildInputs = [ makeWrapper ]; @@ -53,23 +52,20 @@ installPhase = --add-flags "-cp $out/share/java/foo.jar org.foo.Main" ''; + Note the use of jre, which is the part of the OpenJDK + package that contains the Java Runtime Environment. By using + ${jre}/bin/java instead of + ${jdk}/bin/java, you prevent your package from depending + on the JDK at runtime. + -Note the use of jre, which is the part of the -OpenJDK package that contains the Java Runtime Environment. By using -${jre}/bin/java instead of -${jdk}/bin/java, you prevent your package from -depending on the JDK at runtime. - -It is possible to use a different Java compiler than -javac from the OpenJDK. For instance, to use the -GNU Java Compiler: - + + It is possible to use a different Java compiler than javac + from the OpenJDK. For instance, to use the GNU Java Compiler: buildInputs = [ gcj ant ]; - -Here, Ant will automatically use gij (the GNU Java -Runtime) instead of the OpenJRE. - + Here, Ant will automatically use gij (the GNU Java + Runtime) instead of the OpenJRE. +
- diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml index 39b086af4cb1..210140299960 100644 --- a/doc/languages-frameworks/lua.xml +++ b/doc/languages-frameworks/lua.xml @@ -1,24 +1,22 @@
+ Lua -Lua - - - Lua packages are built by the buildLuaPackage function. This function is - implemented - in + + Lua packages are built by the buildLuaPackage function. + This function is implemented in + pkgs/development/lua-modules/generic/default.nix and works similarly to buildPerlPackage. (See for details.) - + - - Lua packages are defined - in pkgs/top-level/lua-packages.nix. + + Lua packages are defined in + pkgs/top-level/lua-packages.nix. Most of them are simple. For example: - - + fileSystem = buildLuaPackage { name = "filesystem-1.6.2"; src = fetchurl { @@ -32,20 +30,19 @@ fileSystem = buildLuaPackage { }; }; - + - + Though, more complicated package should be placed in a seperate file in pkgs/development/lua-modules. - - - Lua packages accept additional parameter disabled, which defines - the condition of disabling package from luaPackages. For example, if package has - disabled assigned to lua.luaversion != "5.1", - it will not be included in any luaPackages except lua51Packages, making it - only be built for lua 5.1. - + + + Lua packages accept additional parameter disabled, which + defines the condition of disabling package from luaPackages. For example, if + package has disabled assigned to lua.luaversion + != "5.1", it will not be included in any luaPackages except + lua51Packages, making it only be built for lua 5.1. +
- diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index 149fcb275a09..2fe64999e139 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -1,24 +1,27 @@
+ Perl -Perl + + Nixpkgs provides a function buildPerlPackage, a generic + package builder function for any Perl package that has a standard + Makefile.PL. It’s implemented in + pkgs/development/perl-modules/generic. + -Nixpkgs provides a function buildPerlPackage, -a generic package builder function for any Perl package that has a -standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. - -Perl packages from CPAN are defined in + Perl packages from CPAN are defined in + pkgs/top-level/perl-packages.nix, -rather than pkgs/all-packages.nix. Most Perl -packages are so straight-forward to build that they are defined here -directly, rather than having a separate function for each package -called from perl-packages.nix. However, more -complicated packages should be put in a separate file, typically in -pkgs/development/perl-modules. Here is an -example of the former: - + rather than pkgs/all-packages.nix. Most Perl packages + are so straight-forward to build that they are defined here directly, rather + than having a separate function for each package called from + perl-packages.nix. However, more complicated packages + should be put in a separate file, typically in + pkgs/development/perl-modules. Here is an example of the + former: ClassC3 = buildPerlPackage rec { name = "Class-C3-0.21"; @@ -28,74 +31,72 @@ ClassC3 = buildPerlPackage rec { }; }; - -Note the use of mirror://cpan/, and the -${name} in the URL definition to ensure that the -name attribute is consistent with the source that we’re actually -downloading. Perl packages are made available in -all-packages.nix through the variable -perlPackages. For instance, if you have a package -that needs ClassC3, you would typically write - + Note the use of mirror://cpan/, and the + ${name} in the URL definition to ensure that the name + attribute is consistent with the source that we’re actually downloading. + Perl packages are made available in all-packages.nix + through the variable perlPackages. For instance, if you + have a package that needs ClassC3, you would typically + write foo = import ../path/to/foo.nix { inherit stdenv fetchurl ...; inherit (perlPackages) ClassC3; }; - -in all-packages.nix. You can test building a -Perl package as follows: - + in all-packages.nix. You can test building a Perl + package as follows: $ nix-build -A perlPackages.ClassC3 - -buildPerlPackage adds perl- to -the start of the name attribute, so the package above is actually -called perl-Class-C3-0.21. So to install it, you -can say: - + buildPerlPackage adds perl- to the + start of the name attribute, so the package above is actually called + perl-Class-C3-0.21. So to install it, you can say: $ nix-env -i perl-Class-C3 + (Of course you can also install using the attribute name: nix-env -i + -A perlPackages.ClassC3.) + -(Of course you can also install using the attribute name: -nix-env -i -A perlPackages.ClassC3.) - -So what does buildPerlPackage do? It does -the following: - - - - In the configure phase, it calls perl - Makefile.PL to generate a Makefile. You can set the - variable makeMakerFlags to pass flags to - Makefile.PL - - It adds the contents of the PERL5LIB - environment variable to #! .../bin/perl line of - Perl scripts as -Idir - flags. This ensures that a script can find its - dependencies. - - In the fixup phase, it writes the propagated build - inputs (propagatedBuildInputs) to the file - $out/nix-support/propagated-user-env-packages. - nix-env recursively installs all packages listed - in this file when you install a package that has it. This ensures - that a Perl package can find its dependencies. - - - - - -buildPerlPackage is built on top of -stdenv, so everything can be customised in the -usual way. For instance, the BerkeleyDB module has -a preConfigure hook to generate a configuration -file used by Makefile.PL: + + So what does buildPerlPackage do? It does the following: + + + + In the configure phase, it calls perl Makefile.PL to + generate a Makefile. You can set the variable + makeMakerFlags to pass flags to + Makefile.PL + + + + + It adds the contents of the PERL5LIB environment variable + to #! .../bin/perl line of Perl scripts as + -Idir flags. This ensures + that a script can find its dependencies. + + + + + In the fixup phase, it writes the propagated build inputs + (propagatedBuildInputs) to the file + $out/nix-support/propagated-user-env-packages. + nix-env recursively installs all packages listed in + this file when you install a package that has it. This ensures that a Perl + package can find its dependencies. + + + + + + buildPerlPackage is built on top of + stdenv, so everything can be customised in the usual way. + For instance, the BerkeleyDB module has a + preConfigure hook to generate a configuration file used by + Makefile.PL: { buildPerlPackage, fetchurl, db }: @@ -113,18 +114,15 @@ buildPerlPackage rec { ''; } + - - -Dependencies on other Perl packages can be specified in the -buildInputs and -propagatedBuildInputs attributes. If something is -exclusively a build-time dependency, use -buildInputs; if it’s (also) a runtime dependency, -use propagatedBuildInputs. For instance, this -builds a Perl module that has runtime dependencies on a bunch of other -modules: - + + Dependencies on other Perl packages can be specified in the + buildInputs and propagatedBuildInputs + attributes. If something is exclusively a build-time dependency, use + buildInputs; if it’s (also) a runtime dependency, use + propagatedBuildInputs. For instance, this builds a Perl + module that has runtime dependencies on a bunch of other modules: ClassC3Componentised = buildPerlPackage rec { name = "Class-C3-Componentised-1.0004"; @@ -137,24 +135,26 @@ ClassC3Componentised = buildPerlPackage rec { ]; }; + - +
+ Generation from CPAN -
Generation from CPAN - -Nix expressions for Perl packages can be generated (almost) -automatically from CPAN. This is done by the program -nix-generate-from-cpan, which can be installed -as follows: + + Nix expressions for Perl packages can be generated (almost) automatically + from CPAN. This is done by the program + nix-generate-from-cpan, which can be installed as + follows: + $ nix-env -i nix-generate-from-cpan -This program takes a Perl module name, looks it up on CPAN, -fetches and unpacks the corresponding package, and prints a Nix -expression on standard output. For example: - + + This program takes a Perl module name, looks it up on CPAN, fetches and + unpacks the corresponding package, and prints a Nix expression on standard + output. For example: $ nix-generate-from-cpan XML::Simple XMLSimple = buildPerlPackage rec { @@ -170,26 +170,23 @@ $ nix-generate-from-cpan XML::Simple }; }; + The output can be pasted into + pkgs/top-level/perl-packages.nix or wherever else you + need it. + +
-The output can be pasted into -pkgs/top-level/perl-packages.nix or wherever else -you need it. +
+ Cross-compiling modules + + Nixpkgs has experimental support for cross-compiling Perl modules. In many + cases, it will just work out of the box, even for modules with native + extensions. Sometimes, however, the Makefile.PL for a module may + (indirectly) import a native module. In that case, you will need to make a + stub for that module that will satisfy the Makefile.PL and install it into + lib/perl5/site_perl/cross_perl/${perl.version}. See the + postInstall for DBI for an example. + +
- -
Cross-compiling modules - -Nixpkgs has experimental support for cross-compiling Perl -modules. In many cases, it will just work out of the box, even for -modules with native extensions. Sometimes, however, the Makefile.PL -for a module may (indirectly) import a native module. In that case, -you will need to make a stub for that module that will satisfy the -Makefile.PL and install it into -lib/perl5/site_perl/cross_perl/${perl.version}. -See the postInstall for DBI for -an example. - -
- -
- diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index 1dbbb5341ba3..b9b605b81da1 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -1,58 +1,74 @@
+ Qt -Qt + + Qt is a comprehensive desktop and mobile application development toolkit for + C++. Legacy support is available for Qt 3 and Qt 4, but all current + development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to + take advantage of new features, but older versions are typically retained + until their support window ends. The most important consideration in + packaging Qt-based software is ensuring that each package and all its + dependencies use the same version of Qt 5; this consideration motivates most + of the tools described below. + - -Qt is a comprehensive desktop and mobile application development toolkit for C++. -Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. -The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, -but older versions are typically retained until their support window ends. -The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5; -this consideration motivates most of the tools described below. - +
+ Packaging Libraries for Nixpkgs -
Packaging Libraries for Nixpkgs + + Whenever possible, libraries that use Qt 5 should be built with each + available version. Packages providing libraries should be added to the + top-level function mkLibsForQt5, which is used to build a + set of libraries for every Qt 5 version. A special + callPackage function is used in this scope to ensure that + the entire dependency tree uses the same Qt 5 version. Import dependencies + unqualified, i.e., qtbase not + qt5.qtbase. Do not import a package + set such as qt5 or libsForQt5. + - -Whenever possible, libraries that use Qt 5 should be built with each available version. -Packages providing libraries should be added to the top-level function mkLibsForQt5, -which is used to build a set of libraries for every Qt 5 version. -A special callPackage function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version. -Import dependencies unqualified, i.e., qtbase not qt5.qtbase. -Do not import a package set such as qt5 or libsForQt5. - + + If a library does not support a particular version of Qt 5, it is best to + mark it as broken by setting its meta.broken attribute. A + package may be marked broken for certain versions by testing the + qtbase.version attribute, which will always give the + current Qt 5 version. + +
- -If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its meta.broken attribute. -A package may be marked broken for certain versions by testing the qtbase.version attribute, which will always give the current Qt 5 version. - +
+ Packaging Applications for Nixpkgs + + Call your application expression using + libsForQt5.callPackage instead of + callPackage. Import dependencies unqualified, i.e., + qtbase not qt5.qtbase. Do + not import a package set such as qt5 or + libsForQt5. + + + + Qt 5 maintains strict backward compatibility, so it is generally best to + build an application package against the latest version using the + libsForQt5 library set. In case a package does not build + with the latest Qt version, it is possible to pick a set pinned to a + particular version, e.g. libsForQt55 for Qt 5.5, if that + is the latest version the package supports. If a package must be pinned to + an older Qt version, be sure to file a bug upstream; because Qt is strictly + backwards-compatible, any incompatibility is by definition a bug in the + application. + + + + When testing applications in Nixpkgs, it is a common practice to build the + package with nix-build and run it using the created + symbolic link. This will not work with Qt applications, however, because + they have many hard runtime requirements that can only be guaranteed if the + package is actually installed. To test a Qt application, install it with + nix-env or run it inside nix-shell. + +
- -
Packaging Applications for Nixpkgs - - -Call your application expression using libsForQt5.callPackage instead of callPackage. -Import dependencies unqualified, i.e., qtbase not qt5.qtbase. -Do not import a package set such as qt5 or libsForQt5. - - - -Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the libsForQt5 library set. -In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. libsForQt55 for Qt 5.5, if that is the latest version the package supports. -If a package must be pinned to an older Qt version, be sure to file a bug upstream; -because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application. - - - -When testing applications in Nixpkgs, it is a common practice to build the package with nix-build and run it using the created symbolic link. -This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed. -To test a Qt application, install it with nix-env or run it inside nix-shell. - - -
- -
- diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 6bb809192f89..c52a72a3df4a 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -1,17 +1,19 @@
+ Ruby -Ruby + + There currently is support to bundle applications that are packaged as Ruby + gems. The utility "bundix" allows you to write a + Gemfile, let bundler create a + Gemfile.lock, and then convert this into a nix + expression that contains all Gem dependencies automatically. + -There currently is support to bundle applications that are packaged as -Ruby gems. The utility "bundix" allows you to write a -Gemfile, let bundler create a -Gemfile.lock, and then convert this into a nix -expression that contains all Gem dependencies automatically. - - -For example, to package sensu, we did: + + For example, to package sensu, we did: + -Please check in the Gemfile, -Gemfile.lock and the -gemset.nix so future updates can be run easily. - + + Please check in the Gemfile, + Gemfile.lock and the gemset.nix so + future updates can be run easily. + -For tools written in Ruby - i.e. where the desire is to install -a package and then execute e.g. rake at the command -line, there is an alternative builder called bundlerApp. -Set up the gemset.nix the same way, and then, for -example: - + + For tools written in Ruby - i.e. where the desire is to install a package and + then execute e.g. rake at the command line, there is an + alternative builder called bundlerApp. Set up the + gemset.nix the same way, and then, for example: + -The chief advantage of bundlerApp over -bundlerEnv is the executables introduced in the -environment are precisely those selected in the exes -list, as opposed to bundlerEnv which adds all the -executables made available by gems in the gemset, which can mean e.g. -rspec or rake in unpredictable -versions available from various packages. - + + The chief advantage of bundlerApp over + bundlerEnv is the executables introduced in the + environment are precisely those selected in the exes list, + as opposed to bundlerEnv which adds all the executables + made available by gems in the gemset, which can mean e.g. + rspec or rake in unpredictable versions + available from various packages. + -Resulting derivations for both builders also have two helpful -attributes, env and wrappedRuby. -The first one allows one to quickly drop into -nix-shell with the specified environment present. -E.g. nix-shell -A sensu.env would give you an -environment with Ruby preset so it has all the libraries necessary -for sensu in its paths. The second one can be -used to make derivations from custom Ruby scripts which have -Gemfiles with their dependencies specified. It is -a derivation with ruby wrapped so it can find all -the needed dependencies. For example, to make a derivation -my-script for a my-script.rb -(which should be placed in bin) you should run -bundix as specified above and then use -bundlerEnv like this: - + + Resulting derivations for both builders also have two helpful attributes, + env and wrappedRuby. The first one + allows one to quickly drop into nix-shell with the + specified environment present. E.g. nix-shell -A sensu.env + would give you an environment with Ruby preset so it has all the libraries + necessary for sensu in its paths. The second one can be + used to make derivations from custom Ruby scripts which have + Gemfiles with their dependencies specified. It is a + derivation with ruby wrapped so it can find all the needed + dependencies. For example, to make a derivation my-script + for a my-script.rb (which should be placed in + bin) you should run bundix as + specified above and then use bundlerEnv like this: + -
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index 4515e17ec09e..af0b07166e3e 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -1,27 +1,42 @@
+ TeX Live -TeX Live + + Since release 15.09 there is a new TeX Live packaging that lives entirely + under attribute texlive. + + +
+ User's guide -Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute texlive. -
User's guide - - For basic usage just pull texlive.combined.scheme-basic for an environment with basic LaTeX support. - - It typically won't work to use separately installed packages together. - Instead, you can build a custom set of packages like this: - + + + For basic usage just pull texlive.combined.scheme-basic + for an environment with basic LaTeX support. + + + + + It typically won't work to use separately installed packages together. + Instead, you can build a custom set of packages like this: + texlive.combine { inherit (texlive) scheme-small collection-langkorean algorithms cm-super; } - There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). - - - By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add pkgFilter function to combine. - + There are all the schemes, collections and a few thousand packages, as + defined upstream (perhaps with tiny differences). + + + + + By default you only get executables and files needed during runtime, and a + little documentation for the core packages. To change that, you need to + add pkgFilter function to combine. + texlive.combine { # inherit (texlive) whatever-you-want; pkgFilter = pkg: @@ -30,34 +45,55 @@ texlive.combine { # there are also other attributes: version, name } - - - You can list packages e.g. by nix-repl. - + + + + + You can list packages e.g. by nix-repl. + $ nix-repl nix-repl> :l <nixpkgs> nix-repl> texlive.collection-<TAB> - - - Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example scheme-basic, into the combination. - + + + + + Note that the wrapper assumes that the result has a chance to be useful. + For example, the core executables should be present, as well as some core + data files. The supported way of ensuring this is by including some + scheme, for example scheme-basic, into the combination. + + -
+
+ +
+ Known problems -
Known problems - - Some tools are still missing, e.g. luajittex; - - some apps aren't packaged/tested yet (asymptote, biber, etc.); - - feature/bug: when a package is rejected by pkgFilter, its dependencies are still propagated; - - in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat. + + + Some tools are still missing, e.g. luajittex; + + + + + some apps aren't packaged/tested yet (asymptote, biber, etc.); + + + + + feature/bug: when a package is rejected by pkgFilter, + its dependencies are still propagated; + + + + + in case of any bugs or feature requests, file a github issue or better a + pull request and /cc @vcunat. + + +
- - -
- diff --git a/doc/manual.xml b/doc/manual.xml index 385079eb5785..f31897aed039 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,29 +1,24 @@ - - - - Nixpkgs Contributors Guide - - Version - - - - - - - - - - - - - - - - - - - - + + Nixpkgs Contributors Guide + Version + + + + + + + + + + + + + + + + + + diff --git a/doc/meta.xml b/doc/meta.xml index 5dbe810810d1..ad16e7683f58 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -1,14 +1,12 @@ - -Meta-attributes - -Nix packages can declare meta-attributes -that contain information about a package such as a description, its -homepage, its license, and so on. For instance, the GNU Hello package -has a meta declaration like this: - + Meta-attributes + + Nix packages can declare meta-attributes that contain + information about a package such as a description, its homepage, its license, + and so on. For instance, the GNU Hello package has a meta + declaration like this: meta = { description = "A program that produces a familiar, friendly greeting"; @@ -22,16 +20,15 @@ meta = { platforms = stdenv.lib.platforms.all; }; - - - -Meta-attributes are not passed to the builder of the package. -Thus, a change to a meta-attribute doesn’t trigger a recompilation of -the package. The value of a meta-attribute must be a string. - -The meta-attributes of a package can be queried from the -command-line using nix-env: - + + + Meta-attributes are not passed to the builder of the package. Thus, a change + to a meta-attribute doesn’t trigger a recompilation of the package. The + value of a meta-attribute must be a string. + + + The meta-attributes of a package can be queried from the command-line using + nix-env: $ nix-env -qa hello --json { @@ -70,252 +67,299 @@ $ nix-env -qa hello --json - -nix-env knows about the -description field specifically: - + nix-env knows about the description + field specifically: $ nix-env -qa hello --description hello-2.3 A program that produces a familiar, friendly greeting + +
+ Standard meta-attributes - + + It is expected that each meta-attribute is one of the following: + - -
Standard -meta-attributes - -It is expected that each meta-attribute is one of the following: - - - - - description - A short (one-line) description of the package. - This is shown by nix-env -q --description and - also on the Nixpkgs release pages. - - Don’t include a period at the end. Don’t include newline - characters. Capitalise the first character. For brevity, don’t - repeat the name of package — just describe what it does. - - Wrong: "libpng is a library that allows you to decode PNG images." - - Right: "A library for decoding PNG images" - - - - - - longDescription - An arbitrarily long description of the - package. - - - - branch - Release branch. Used to specify that a package is not - going to receive updates that are not in this branch; for example, Linux - kernel 3.0 is supposed to be updated to 3.0.X, not 3.1. - - - - homepage - The package’s homepage. Example: - http://www.gnu.org/software/hello/manual/ - - - - downloadPage - The page where a link to the current version can be found. Example: - http://ftp.gnu.org/gnu/hello/ - - - - license + + + description + - - The license, or licenses, for the package. One from the attribute set - defined in - nixpkgs/lib/licenses.nix. At this moment - using both a list of licenses and a single license is valid. If the - license field is in the form of a list representation, then it means - that parts of the package are licensed differently. Each license - should preferably be referenced by their attribute. The non-list - attribute value can also be a space delimited string representation of - the contained attribute shortNames or spdxIds. The following are all valid - examples: - - Single license referenced by attribute (preferred) - stdenv.lib.licenses.gpl3. - - Single license referenced by its attribute shortName (frowned upon) - "gpl3". - - Single license referenced by its attribute spdxId (frowned upon) - "GPL-3.0". - - Multiple licenses referenced by attribute (preferred) - with stdenv.lib.licenses; [ asl20 free ofl ]. - - Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon) - "asl20 free ofl". - - - For details, see . - + + A short (one-line) description of the package. This is shown by + nix-env -q --description and also on the Nixpkgs + release pages. + + + Don’t include a period at the end. Don’t include newline characters. + Capitalise the first character. For brevity, don’t repeat the name of + package — just describe what it does. + + + Wrong: "libpng is a library that allows you to decode PNG + images." + + + Right: "A library for decoding PNG images" + - - - - maintainers - A list of names and e-mail addresses of the - maintainers of this Nix expression. If - you would like to be a maintainer of a package, you may want to add - yourself to + + longDescription + + + + An arbitrarily long description of the package. + + + + + branch + + + + Release branch. Used to specify that a package is not going to receive + updates that are not in this branch; for example, Linux kernel 3.0 is + supposed to be updated to 3.0.X, not 3.1. + + + + + homepage + + + + The package’s homepage. Example: + http://www.gnu.org/software/hello/manual/ + + + + + downloadPage + + + + The page where a link to the current version can be found. Example: + http://ftp.gnu.org/gnu/hello/ + + + + + license + + + + The license, or licenses, for the package. One from the attribute set + defined in + + nixpkgs/lib/licenses.nix. At this moment + using both a list of licenses and a single license is valid. If the + license field is in the form of a list representation, then it means that + parts of the package are licensed differently. Each license should + preferably be referenced by their attribute. The non-list attribute value + can also be a space delimited string representation of the contained + attribute shortNames or spdxIds. The following are all valid examples: + + + + Single license referenced by attribute (preferred) + stdenv.lib.licenses.gpl3. + + + + + Single license referenced by its attribute shortName (frowned upon) + "gpl3". + + + + + Single license referenced by its attribute spdxId (frowned upon) + "GPL-3.0". + + + + + Multiple licenses referenced by attribute (preferred) with + stdenv.lib.licenses; [ asl20 free ofl ]. + + + + + Multiple licenses referenced as a space delimited string of attribute + shortNames (frowned upon) "asl20 free ofl". + + + + For details, see . + + + + + maintainers + + + + A list of names and e-mail addresses of the maintainers of this Nix + expression. If you would like to be a maintainer of a package, you may + want to add yourself to + nixpkgs/maintainers/maintainer-list.nix - and write something like [ stdenv.lib.maintainers.alice - stdenv.lib.maintainers.bob ]. - - - - priority - The priority of the package, - used by nix-env to resolve file name conflicts - between packages. See the Nix manual page for - nix-env for details. Example: - "10" (a low-priority - package). - - - - platforms - The list of Nix platform types on which the - package is supported. Hydra builds packages according to the - platform specified. If no platform is specified, the package does - not have prebuilt binaries. An example is: - + and write something like [ stdenv.lib.maintainers.alice + stdenv.lib.maintainers.bob ]. + + + + + priority + + + + The priority of the package, used by + nix-env to resolve file name conflicts between + packages. See the Nix manual page for nix-env for + details. Example: "10" (a low-priority package). + + + + + platforms + + + + The list of Nix platform types on which the package is supported. Hydra + builds packages according to the platform specified. If no platform is + specified, the package does not have prebuilt binaries. An example is: meta.platforms = stdenv.lib.platforms.linux; - - Attribute Set stdenv.lib.platforms defines - - various common lists of platforms types. - - - - hydraPlatforms - The list of Nix platform types for which the Hydra - instance at hydra.nixos.org will build the - package. (Hydra is the Nix-based continuous build system.) It - defaults to the value of meta.platforms. Thus, - the only reason to set meta.hydraPlatforms is - if you want hydra.nixos.org to build the - package on a subset of meta.platforms, or not - at all, e.g. - + Attribute Set stdenv.lib.platforms defines + + various common lists of platforms types. + + + + + hydraPlatforms + + + + The list of Nix platform types for which the Hydra instance at + hydra.nixos.org will build the package. (Hydra is the + Nix-based continuous build system.) It defaults to the value of + meta.platforms. Thus, the only reason to set + meta.hydraPlatforms is if you want + hydra.nixos.org to build the package on a subset of + meta.platforms, or not at all, e.g. meta.platforms = stdenv.lib.platforms.linux; meta.hydraPlatforms = []; + + + + + broken + + + + If set to true, the package is marked as “broken”, + meaning that it won’t show up in nix-env -qa, and + cannot be built or installed. Such packages should be removed from + Nixpkgs eventually unless they are fixed. + + + + + updateWalker + + + + If set to true, the package is tested to be updated + correctly by the update-walker.sh script without + additional settings. Such packages have meta.version + set and their homepage (or the page specified by + meta.downloadPage) contains a direct link to the + package tarball. + + + + +
+
+ Licenses - - - - - broken - If set to true, the package is - marked as “broken”, meaning that it won’t show up in - nix-env -qa, and cannot be built or installed. - Such packages should be removed from Nixpkgs eventually unless - they are fixed. - - - - updateWalker - If set to true, the package is - tested to be updated correctly by the update-walker.sh - script without additional settings. Such packages have - meta.version set and their homepage (or - the page specified by meta.downloadPage) contains - a direct link to the package tarball. - - - - - -
- - -
Licenses - -The meta.license attribute should preferrably contain -a value from stdenv.lib.licenses defined in - -nixpkgs/lib/licenses.nix, -or in-place license description of the same format if the license is -unlikely to be useful in another expression. - -Although it's typically better to indicate the specific license, -a few generic options are available: - - - - - stdenv.lib.licenses.free, - "free" - - Catch-all for free software licenses not listed - above. - - - - stdenv.lib.licenses.unfreeRedistributable, - "unfree-redistributable" - - Unfree package that can be redistributed in binary - form. That is, it’s legal to redistribute the - output of the derivation. This means that - the package can be included in the Nixpkgs - channel. - - Sometimes proprietary software can only be redistributed - unmodified. Make sure the builder doesn’t actually modify the - original binaries; otherwise we’re breaking the license. For - instance, the NVIDIA X11 drivers can be redistributed unmodified, - but our builder applies patchelf to make them - work. Thus, its license is "unfree" and it - cannot be included in the Nixpkgs channel. - - - - stdenv.lib.licenses.unfree, - "unfree" - - Unfree package that cannot be redistributed. You - can build it yourself, but you cannot redistribute the output of - the derivation. Thus it cannot be included in the Nixpkgs - channel. - - - - stdenv.lib.licenses.unfreeRedistributableFirmware, - "unfree-redistributable-firmware" - - This package supplies unfree, redistributable - firmware. This is a separate value from - unfree-redistributable because not everybody - cares whether firmware is free. - - - - - - - -
- + + The meta.license attribute should preferrably contain a + value from stdenv.lib.licenses defined in + + nixpkgs/lib/licenses.nix, or in-place license + description of the same format if the license is unlikely to be useful in + another expression. + + + Although it's typically better to indicate the specific license, a few + generic options are available: + + + stdenv.lib.licenses.free, + "free" + + + + Catch-all for free software licenses not listed above. + + + + + stdenv.lib.licenses.unfreeRedistributable, + "unfree-redistributable" + + + + Unfree package that can be redistributed in binary form. That is, it’s + legal to redistribute the output of the derivation. + This means that the package can be included in the Nixpkgs channel. + + + Sometimes proprietary software can only be redistributed unmodified. + Make sure the builder doesn’t actually modify the original binaries; + otherwise we’re breaking the license. For instance, the NVIDIA X11 + drivers can be redistributed unmodified, but our builder applies + patchelf to make them work. Thus, its license is + "unfree" and it cannot be included in the Nixpkgs + channel. + + + + + stdenv.lib.licenses.unfree, + "unfree" + + + + Unfree package that cannot be redistributed. You can build it yourself, + but you cannot redistribute the output of the derivation. Thus it cannot + be included in the Nixpkgs channel. + + + + + stdenv.lib.licenses.unfreeRedistributableFirmware, + "unfree-redistributable-firmware" + + + + This package supplies unfree, redistributable firmware. This is a + separate value from unfree-redistributable because + not everybody cares whether firmware is free. + + + + + +
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 277d3d814136..040c12c92913 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -5,105 +5,319 @@ + Multiple-output packages +
+ Introduction -Multiple-output packages + + The Nix language allows a derivation to produce multiple outputs, which is + similar to what is utilized by other Linux distribution packaging systems. + The outputs reside in separate nix store paths, so they can be mostly + handled independently of each other, including passing to build inputs, + garbage collection or binary substitution. The exception is that building + from source always produces all the outputs. + -
Introduction - The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs. - The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. - The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. -
+ + The main motivation is to save disk space by reducing runtime closure sizes; + consequently also sizes of substituted binaries get reduced. Splitting can + be used to have more granular runtime dependencies, for example the typical + reduction is to split away development-only files, as those are typically + not needed during runtime. As a result, closure sizes of many packages can + get reduced to a half or even much less. + + + + + The reduction effects could be instead achieved by building the parts in + completely separate derivations. That would often additionally reduce + build-time closures, but it tends to be much harder to write such + derivations, as build systems typically assume all parts are being built at + once. This compromise approach of single source package producing multiple + binary packages is also utilized often by rpm and deb. + + +
+
+ Installing a split package + + + When installing a package via systemPackages or + nix-env you have several options: + -
Installing a split package - When installing a package via systemPackages or nix-env you have several options: - You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The outputs attribute contains a list of output names. - You can let it use the default outputs. These are handled by meta.outputsToInstall attribute that contains a list of output names. - TODO: more about tweaking the attribute, etc. - NixOS provides configuration option environment.extraOutputsToInstall that allows adding extra outputs of environment.systemPackages atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options. - At this moment there is no similar configurability for packages installed by nix-env. You can still use approach from to override meta.outputsToInstall attributes, but that's a rather inconvenient way. - + + + You can install particular outputs explicitly, as each is available in the + Nix language as an attribute of the package. The + outputs attribute contains a list of output names. + + + + + You can let it use the default outputs. These are handled by + meta.outputsToInstall attribute that contains a list of + output names. + + + TODO: more about tweaking the attribute, etc. + + + + + NixOS provides configuration option + environment.extraOutputsToInstall that allows adding + extra outputs of environment.systemPackages atop the + default ones. It's mainly meant for documentation and debug symbols, and + it's also modified by specific options. + + + + At this moment there is no similar configurability for packages installed + by nix-env. You can still use approach from + to override + meta.outputsToInstall attributes, but that's a rather + inconvenient way. + + + -
+
+
+ Using a split package -
Using a split package - In the Nix language the individual outputs can be reached explicitly as attributes, e.g. coreutils.info, but the typical case is just using packages as build inputs. - When a multiple-output derivation gets into a build input of another derivation, the dev output is added if it exists, otherwise the first output is added. In addition to that, propagatedBuildOutputs of that package which by default contain $outputBin and $outputLib are also added. (See .) -
+ + In the Nix language the individual outputs can be reached explicitly as + attributes, e.g. coreutils.info, but the typical case is + just using packages as build inputs. + + + When a multiple-output derivation gets into a build input of another + derivation, the dev output is added if it exists, + otherwise the first output is added. In addition to that, + propagatedBuildOutputs of that package which by default + contain $outputBin and $outputLib are + also added. (See .) + +
+
+ Writing a split derivation -
Writing a split derivation - Here you find how to write a derivation that produces multiple outputs. - In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; it's relatively well-readable. The whole machinery is triggered by defining the outputs attribute to contain the list of desired output names (strings). - outputs = [ "bin" "dev" "out" "doc" ]; - Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. - There is a special handling of the debug output, described at . + + Here you find how to write a derivation that produces multiple outputs. + + + + In nixpkgs there is a framework supporting multiple-output derivations. It + tries to cover most cases by default behavior. You can find the source + separated in + <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; + it's relatively well-readable. The whole machinery is triggered by defining + the outputs attribute to contain the list of desired + output names (strings). + + +outputs = [ "bin" "dev" "out" "doc" ]; + + + Often such a single line is enough. For each output an equally named + environment variable is passed to the builder and contains the path in nix + store for that output. Typically you also want to have the main + out output, as it catches any files that didn't get + elsewhere. + + + + + There is a special handling of the debug output, + described at . + +
- <quote>Binaries first</quote> - A commonly adopted convention in nixpkgs is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the perl package contains a perl executable it can be referenced as ${pkgs.perl}/bin/perl within a Nix derivation that needs to execute a Perl script. - The glibc package is a deliberate single exception to the binaries first convention. The glibc has libs as its first output allowing the libraries provided by glibc to be referenced directly (e.g. ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The executables provided by glibc can be accessed via its bin attribute (e.g. ${stdenv.glibc.bin}/bin/ldd). - The reason for why glibc deviates from the convention is because referencing a library provided by glibc is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of glibc libraries from Nix packages (please see the documentation on patchelf for more details). + <quote>Binaries first</quote> + + + A commonly adopted convention in nixpkgs is that + executables provided by the package are contained within its first output. + This convention allows the dependent packages to reference the executables + provided by packages in a uniform manner. For instance, provided with the + knowledge that the perl package contains a + perl executable it can be referenced as + ${pkgs.perl}/bin/perl within a Nix derivation that needs + to execute a Perl script. + + + + The glibc package is a deliberate single exception to + the binaries first convention. The glibc + has libs as its first output allowing the libraries + provided by glibc to be referenced directly (e.g. + ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The + executables provided by glibc can be accessed via its + bin attribute (e.g. + ${stdenv.glibc.bin}/bin/ldd). + + + + The reason for why glibc deviates from the convention is + because referencing a library provided by glibc is a + very common operation among Nix packages. For instance, third-party + executables packaged by Nix are typically patched and relinked with the + relevant version of glibc libraries from Nix packages + (please see the documentation on + patchelf for more + details). +
- File type groups - The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. - + File type groups - - $outputDev - is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to dev or out by default. - - + + The support code currently recognizes some particular kinds of outputs and + either instructs the build system of the package to put files into their + desired outputs or it moves the files during the fixup phase. Each group of + file types has an outputFoo variable specifying the + output name where they should go. If that variable isn't defined by the + derivation writer, it is guessed – a default output name is defined, + falling back to other possibilities if the output isn't defined. + - - $outputBin - is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. - - - - $outputLib - is meant for libraries, typically residing in lib/ and libexec/. They go to lib or out by default. - - - - $outputDoc - is for user documentation, typically residing in share/doc/. It goes to doc or out by default. - - - - $outputDevdoc - is for developer documentation. Currently we count gtk-doc and devhelp books in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. - - - - $outputMan - is for man pages (except for section 3). They go to man or $outputBin by default. - - - - $outputDevman - is for section 3 man pages. They go to devman or $outputMan by default. - - - - $outputInfo - is for info pages. They go to info or $outputBin by default. - - - + + + + $outputDev + + + + is for development-only files. These include C(++) headers, pkg-config, + cmake and aclocal files. They go to dev or + out by default. + + + + + + $outputBin + + + + is meant for user-facing binaries, typically residing in bin/. They go + to bin or out by default. + + + + + + $outputLib + + + + is meant for libraries, typically residing in lib/ + and libexec/. They go to lib or + out by default. + + + + + + $outputDoc + + + + is for user documentation, typically residing in + share/doc/. It goes to doc or + out by default. + + + + + + $outputDevdoc + + + + is for developer documentation. Currently we count + gtk-doc and devhelp books in there. It goes to devdoc + or is removed (!) by default. This is because e.g. gtk-doc tends to be + rather large and completely unused by nixpkgs users. + + + + + + $outputMan + + + + is for man pages (except for section 3). They go to + man or $outputBin by default. + + + + + + $outputDevman + + + + is for section 3 man pages. They go to devman or + $outputMan by default. + + + + + + $outputInfo + + + + is for info pages. They go to info or + $outputBin by default. + + + +
-
Common caveats - - Some configure scripts don't like some of the parameters passed by default by the framework, e.g. --docdir=/foo/bar. You can disable this by setting setOutputFlags = false;. - The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.) - Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into out, e.g. locale strings, so there is often no advantage in separating the libraries into lib, as keeping them in out is easier. - Some packages have hidden assumptions on install paths, which complicates splitting. - +
+ Common caveats + + + + + Some configure scripts don't like some of the parameters passed by + default by the framework, e.g. --docdir=/foo/bar. You + can disable this by setting setOutputFlags = false;. + + + + + The outputs of a single derivation can retain references to each other, + but note that circular references are not allowed. (And each + strongly-connected component would act as a single output anyway.) + + + + + Most of split packages contain their core functionality in libraries. + These libraries tend to refer to various kind of data that typically gets + into out, e.g. locale strings, so there is often no + advantage in separating the libraries into lib, as + keeping them in out is easier. + + + + + Some packages have hidden assumptions on install paths, which complicates + splitting. + + +
- -
- +
+ diff --git a/doc/overlays.xml b/doc/overlays.xml index cc0aef447d2d..2decf9febe80 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -1,95 +1,117 @@ - -Overlays - -This chapter describes how to extend and change Nixpkgs packages using -overlays. Overlays are used to add layers in the fix-point used by Nixpkgs -to compose the set of all packages. - -Nixpkgs can be configured with a list of overlays, which are -applied in order. This means that the order of the overlays can be significant -if multiple layers override the same package. - + Overlays + + This chapter describes how to extend and change Nixpkgs packages using + overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to + compose the set of all packages. + + + Nixpkgs can be configured with a list of overlays, which are applied in + order. This means that the order of the overlays can be significant if + multiple layers override the same package. + +
+ Installing overlays -
-Installing overlays + + The list of overlays is determined as follows. + -The list of overlays is determined as follows. + + If the overlays argument is not provided explicitly, we + look for overlays in a path. The path is determined as follows: + + + + First, if an overlays argument to the nixpkgs function + itself is given, then that is used. + + + This can be passed explicitly when importing nipxkgs, for example + import <nixpkgs> { overlays = [ overlay1 overlay2 ]; + }. + + + + + Otherwise, if the Nix path entry <nixpkgs-overlays> + exists, we look for overlays at that path, as described below. + + + See the section on NIX_PATH in the Nix manual for more + details on how to set a value for + <nixpkgs-overlays>. + + + + + If one of ~/.config/nixpkgs/overlays.nix and + ~/.config/nixpkgs/overlays/ exists, then we look for + overlays at that path, as described below. It is an error if both exist. + + + + -If the overlays argument is not provided explicitly, we look for overlays in a path. The path -is determined as follows: + + If we are looking for overlays at a path, then there are two cases: + + + + If the path is a file, then the file is imported as a Nix expression and + used as the list of overlays. + + + + + If the path is a directory, then we take the content of the directory, + order it lexicographically, and attempt to interpret each as an overlay + by: + + + + Importing the file, if it is a .nix file. + + + + + Importing a top-level default.nix file, if it is + a directory. + + + + + + + - - - - First, if an overlays argument to the nixpkgs function itself is given, - then that is used. - - This can be passed explicitly when importing nipxkgs, for example - import <nixpkgs> { overlays = [ overlay1 overlay2 ]; }. - - - - Otherwise, if the Nix path entry <nixpkgs-overlays> exists, we look for overlays - at that path, as described below. - - See the section on NIX_PATH in the Nix manual for more details on how to - set a value for <nixpkgs-overlays>. - - - - If one of ~/.config/nixpkgs/overlays.nix and - ~/.config/nixpkgs/overlays/ exists, then we look for overlays at that path, as - described below. It is an error if both exist. - - - - - -If we are looking for overlays at a path, then there are two cases: - - - If the path is a file, then the file is imported as a Nix expression and used as the list of - overlays. - - - - If the path is a directory, then we take the content of the directory, order it - lexicographically, and attempt to interpret each as an overlay by: - - - Importing the file, if it is a .nix file. - - - Importing a top-level default.nix file, if it is a directory. - - - - - - - -On a NixOS system the value of the nixpkgs.overlays option, if present, -is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for -non-NixOS operations (e.g. nix-env), which are looked up independently. - -The overlays.nix option therefore provides a convenient way to use the same -overlays for a NixOS system configuration and user configuration: the same file can be used -as overlays.nix and imported as the value of nixpkgs.overlays. - -
+ + On a NixOS system the value of the nixpkgs.overlays + option, if present, is passed to the system Nixpkgs directly as an argument. + Note that this does not affect the overlays for non-NixOS operations (e.g. + nix-env), which are looked up independently. + + + The overlays.nix option therefore provides a convenient + way to use the same overlays for a NixOS system configuration and user + configuration: the same file can be used as + overlays.nix and imported as the value of + nixpkgs.overlays. + +
+
+ Defining overlays -
-Defining overlays - -Overlays are Nix functions which accept two arguments, -conventionally called self and super, -and return a set of packages. For example, the following is a valid overlay. + + Overlays are Nix functions which accept two arguments, conventionally called + self and super, and return a set of + packages. For example, the following is a valid overlay. + self: super: @@ -104,31 +126,39 @@ self: super: } -The first argument (self) corresponds to the final package -set. You should use this set for the dependencies of all packages specified in your -overlay. For example, all the dependencies of rr in the example above come -from self, as well as the overridden dependencies used in the -boost override. + + The first argument (self) corresponds to the final + package set. You should use this set for the dependencies of all packages + specified in your overlay. For example, all the dependencies of + rr in the example above come from + self, as well as the overridden dependencies used in the + boost override. + -The second argument (super) -corresponds to the result of the evaluation of the previous stages of -Nixpkgs. It does not contain any of the packages added by the current -overlay, nor any of the following overlays. This set should be used either -to refer to packages you wish to override, or to access functions defined -in Nixpkgs. For example, the original recipe of boost -in the above example, comes from super, as well as the -callPackage function. + + The second argument (super) corresponds to the result of + the evaluation of the previous stages of Nixpkgs. It does not contain any of + the packages added by the current overlay, nor any of the following + overlays. This set should be used either to refer to packages you wish to + override, or to access functions defined in Nixpkgs. For example, the + original recipe of boost in the above example, comes from + super, as well as the callPackage + function. + -The value returned by this function should be a set similar to -pkgs/top-level/all-packages.nix, containing -overridden and/or new packages. - -Overlays are similar to other methods for customizing Nixpkgs, in particular -the packageOverrides attribute described in . -Indeed, packageOverrides acts as an overlay with only the -super argument. It is therefore appropriate for basic use, -but overlays are more powerful and easier to distribute. - -
+ + The value returned by this function should be a set similar to + pkgs/top-level/all-packages.nix, containing overridden + and/or new packages. + + + Overlays are similar to other methods for customizing Nixpkgs, in particular + the packageOverrides attribute described in + . Indeed, + packageOverrides acts as an overlay with only the + super argument. It is therefore appropriate for basic + use, but overlays are more powerful and easier to distribute. + +
diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 1fccfd5d329d..f16826ae6806 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -1,206 +1,185 @@ - -Package Notes - -This chapter contains information about how to use and maintain -the Nix expressions for a number of specific packages, such as the -Linux kernel or X.org. - - + Package Notes + + This chapter contains information about how to use and maintain the Nix + expressions for a number of specific packages, such as the Linux kernel or + X.org. + +
+ Linux kernel -
+ + The Nix expressions to build the Linux kernel are in + pkgs/os-specific/linux/kernel. + -Linux kernel - -The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. - -The function that builds the kernel has an argument -kernelPatches which should be a list of -{name, patch, extraConfig} attribute sets, where -name is the name of the patch (which is included in -the kernel’s meta.description attribute), -patch is the patch itself (possibly compressed), -and extraConfig (optional) is a string specifying -extra options to be concatenated to the kernel configuration file -(.config). - -The kernel derivation exports an attribute -features specifying whether optional functionality -is or isn’t enabled. This is used in NixOS to implement -kernel-specific behaviour. For instance, if the kernel has the -iwlwifi feature (i.e. has built-in support for -Intel wireless chipsets), then NixOS doesn’t have to build the -external iwlwifi package: + + The function that builds the kernel has an argument + kernelPatches which should be a list of {name, + patch, extraConfig} attribute sets, where name + is the name of the patch (which is included in the kernel’s + meta.description attribute), patch is + the patch itself (possibly compressed), and extraConfig + (optional) is a string specifying extra options to be concatenated to the + kernel configuration file (.config). + + + The kernel derivation exports an attribute features + specifying whether optional functionality is or isn’t enabled. This is + used in NixOS to implement kernel-specific behaviour. For instance, if the + kernel has the iwlwifi feature (i.e. has built-in support + for Intel wireless chipsets), then NixOS doesn’t have to build the + external iwlwifi package: modulesTree = [kernel] ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi ++ ...; + - - -How to add a new (major) version of the Linux kernel to Nixpkgs: - - - - - Copy the old Nix expression - (e.g. linux-2.6.21.nix) to the new one - (e.g. linux-2.6.22.nix) and update it. - - - - Add the new kernel to all-packages.nix - (e.g., create an attribute - kernel_2_6_22). - - - - Now we’re going to update the kernel configuration. First - unpack the kernel. Then for each supported platform - (i686, x86_64, - uml) do the following: - + + How to add a new (major) version of the Linux kernel to Nixpkgs: + + + + Copy the old Nix expression (e.g. linux-2.6.21.nix) + to the new one (e.g. linux-2.6.22.nix) and update + it. + + + + + Add the new kernel to all-packages.nix (e.g., create + an attribute kernel_2_6_22). + + + + + Now we’re going to update the kernel configuration. First unpack the + kernel. Then for each supported platform (i686, + x86_64, uml) do the following: - - - Make an copy from the old - config (e.g. config-2.6.21-i686-smp) to - the new one - (e.g. config-2.6.22-i686-smp). - - - - Copy the config file for this platform - (e.g. config-2.6.22-i686-smp) to - .config in the kernel source tree. - - - - - Run make oldconfig - ARCH={i386,x86_64,um} - and answer all questions. (For the uml configuration, also - add SHELL=bash.) Make sure to keep the - configuration consistent between platforms (i.e. don’t - enable some feature on i686 and disable - it on x86_64). - - - - - If needed you can also run make - menuconfig: - - + + + Make an copy from the old config (e.g. + config-2.6.21-i686-smp) to the new one (e.g. + config-2.6.22-i686-smp). + + + + + Copy the config file for this platform (e.g. + config-2.6.22-i686-smp) to + .config in the kernel source tree. + + + + + Run make oldconfig + ARCH={i386,x86_64,um} and answer + all questions. (For the uml configuration, also add + SHELL=bash.) Make sure to keep the configuration + consistent between platforms (i.e. don’t enable some feature on + i686 and disable it on x86_64). + + + + + If needed you can also run make menuconfig: + $ nix-env -i ncurses $ export NIX_CFLAGS_LINK=-lncurses $ make menuconfig ARCH=arch - - - - - - Copy .config over the new config - file (e.g. config-2.6.22-i686-smp). - - + + + + + Copy .config over the new config file (e.g. + config-2.6.22-i686-smp). + + - - - - - - - Test building the kernel: nix-build -A - kernel_2_6_22. If it compiles, ship it! For extra - credit, try booting NixOS with it. - - - - It may be that the new kernel requires updating the external - kernel modules and kernel-dependent packages listed in the - linuxPackagesFor function in - all-packages.nix (such as the NVIDIA drivers, - AUFS, etc.). If the updated packages aren’t backwards compatible - with older kernels, you may need to keep the older versions - around. - - - - - - -
- - + + + + + Test building the kernel: nix-build -A kernel_2_6_22. + If it compiles, ship it! For extra credit, try booting NixOS with it. + + + + + It may be that the new kernel requires updating the external kernel + modules and kernel-dependent packages listed in the + linuxPackagesFor function in + all-packages.nix (such as the NVIDIA drivers, AUFS, + etc.). If the updated packages aren’t backwards compatible with older + kernels, you may need to keep the older versions around. + + + + +
+
+ X.org -
- -X.org - -The Nix expressions for the X.org packages reside in -pkgs/servers/x11/xorg/default.nix. This file is -automatically generated from lists of tarballs in an X.org release. -As such it should not be modified directly; rather, you should modify -the lists, the generator script or the file -pkgs/servers/x11/xorg/overrides.nix, in which you -can override or add to the derivations produced by the -generator. - -The generator is invoked as follows: + + The Nix expressions for the X.org packages reside in + pkgs/servers/x11/xorg/default.nix. This file is + automatically generated from lists of tarballs in an X.org release. As such + it should not be modified directly; rather, you should modify the lists, the + generator script or the file + pkgs/servers/x11/xorg/overrides.nix, in which you can + override or add to the derivations produced by the generator. + + + The generator is invoked as follows: $ cd pkgs/servers/x11/xorg $ cat tarballs-7.5.list extra.list old.list \ | perl ./generate-expr-from-tarballs.pl + For each of the tarballs in the .list files, the script + downloads it, unpacks it, and searches its configure.ac + and *.pc.in files for dependencies. This information is + used to generate default.nix. The generator caches + downloaded tarballs between runs. Pay close attention to the NOT + FOUND: name messages at the end of the + run, since they may indicate missing dependencies. (Some might be optional + dependencies, however.) + -For each of the tarballs in the .list files, the -script downloads it, unpacks it, and searches its -configure.ac and *.pc.in -files for dependencies. This information is used to generate -default.nix. The generator caches downloaded -tarballs between runs. Pay close attention to the NOT FOUND: -name messages at the end of the -run, since they may indicate missing dependencies. (Some might be -optional dependencies, however.) - -A file like tarballs-7.5.list contains all -tarballs in a X.org release. It can be generated like this: - + + A file like tarballs-7.5.list contains all tarballs in + a X.org release. It can be generated like this: $ export i="mirror://xorg/X11R7.4/src/everything/" $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ | sort > tarballs-7.4.list + extra.list contains libraries that aren’t part of + X.org proper, but are closely related to it, such as + libxcb. old.list contains some + packages that were removed from X.org, but are still needed by some people + or by other packages (such as imake). + -extra.list contains libraries that aren’t part of -X.org proper, but are closely related to it, such as -libxcb. old.list contains -some packages that were removed from X.org, but are still needed by -some people or by other packages (such as -imake). - -If the expression for a package requires derivation attributes -that the generator cannot figure out automatically (say, -patches or a postInstall hook), -you should modify -pkgs/servers/x11/xorg/overrides.nix. - -
- - - + + If the expression for a package requires derivation attributes that the + generator cannot figure out automatically (say, patches + or a postInstall hook), you should modify + pkgs/servers/x11/xorg/overrides.nix. + +
- - - - - - -
- +
Eclipse - The Nix expressions related to the Eclipse platform and IDE are in - pkgs/applications/editors/eclipse. + The Nix expressions related to the Eclipse platform and IDE are in + pkgs/applications/editors/eclipse. - Nixpkgs provides a number of packages that will install Eclipse in - its various forms, these range from the bare-bones Eclipse - Platform to the more fully featured Eclipse SDK or Scala-IDE - packages and multiple version are often available. It is possible - to list available Eclipse packages by issuing the command: - + Nixpkgs provides a number of packages that will install Eclipse in its + various forms, these range from the bare-bones Eclipse Platform to the more + fully featured Eclipse SDK or Scala-IDE packages and multiple version are + often available. It is possible to list available Eclipse packages by + issuing the command: $ nix-env -f '<nixpkgs>' -qaP -A eclipses --description - - Once an Eclipse variant is installed it can be run using the - eclipse command, as expected. From within - Eclipse it is then possible to install plugins in the usual manner - by either manually specifying an Eclipse update site or by - installing the Marketplace Client plugin and using it to discover - and install other plugins. This installation method provides an - Eclipse installation that closely resemble a manually installed - Eclipse. + Once an Eclipse variant is installed it can be run using the + eclipse command, as expected. From within Eclipse it is + then possible to install plugins in the usual manner by either manually + specifying an Eclipse update site or by installing the Marketplace Client + plugin and using it to discover and install other plugins. This installation + method provides an Eclipse installation that closely resemble a manually + installed Eclipse. - If you prefer to install plugins in a more declarative manner then - Nixpkgs also offer a number of Eclipse plugins that can be - installed in an Eclipse environment. This - type of environment is created using the function - eclipseWithPlugins found inside the - nixpkgs.eclipses attribute set. This function - takes as argument { eclipse, plugins ? [], jvmArgs ? [] - } where eclipse is a one of the - Eclipse packages described above, plugins is a - list of plugin derivations, and jvmArgs is a - list of arguments given to the JVM running the Eclipse. For - example, say you wish to install the latest Eclipse Platform with - the popular Eclipse Color Theme plugin and also allow Eclipse to - use more RAM. You could then add - + If you prefer to install plugins in a more declarative manner then Nixpkgs + also offer a number of Eclipse plugins that can be installed in an + Eclipse environment. This type of environment is + created using the function eclipseWithPlugins found + inside the nixpkgs.eclipses attribute set. This function + takes as argument { eclipse, plugins ? [], jvmArgs ? [] } + where eclipse is a one of the Eclipse packages described + above, plugins is a list of plugin derivations, and + jvmArgs is a list of arguments given to the JVM running + the Eclipse. For example, say you wish to install the latest Eclipse + Platform with the popular Eclipse Color Theme plugin and also allow Eclipse + to use more RAM. You could then add packageOverrides = pkgs: { myEclipse = with pkgs.eclipses; eclipseWithPlugins { @@ -276,42 +243,38 @@ packageOverrides = pkgs: { }; } - - to your Nixpkgs configuration - (~/.config/nixpkgs/config.nix) and install it by - running nix-env -f '<nixpkgs>' -iA - myEclipse and afterward run Eclipse as usual. It is - possible to find out which plugins are available for installation - using eclipseWithPlugins by running - + to your Nixpkgs configuration + (~/.config/nixpkgs/config.nix) and install it by + running nix-env -f '<nixpkgs>' -iA myEclipse and + afterward run Eclipse as usual. It is possible to find out which plugins are + available for installation using eclipseWithPlugins by + running $ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description - If there is a need to install plugins that are not available in - Nixpkgs then it may be possible to define these plugins outside - Nixpkgs using the buildEclipseUpdateSite and - buildEclipsePlugin functions found in the - nixpkgs.eclipses.plugins attribute set. Use the - buildEclipseUpdateSite function to install a - plugin distributed as an Eclipse update site. This function takes - { name, src } as argument where - src indicates the Eclipse update site archive. - All Eclipse features and plugins within the downloaded update site - will be installed. When an update site archive is not available - then the buildEclipsePlugin function can be - used to install a plugin that consists of a pair of feature and - plugin JARs. This function takes an argument { name, - srcFeature, srcPlugin } where - srcFeature and srcPlugin are - the feature and plugin JARs, respectively. + If there is a need to install plugins that are not available in Nixpkgs then + it may be possible to define these plugins outside Nixpkgs using the + buildEclipseUpdateSite and + buildEclipsePlugin functions found in the + nixpkgs.eclipses.plugins attribute set. Use the + buildEclipseUpdateSite function to install a plugin + distributed as an Eclipse update site. This function takes { name, + src } as argument where src indicates the + Eclipse update site archive. All Eclipse features and plugins within the + downloaded update site will be installed. When an update site archive is not + available then the buildEclipsePlugin function can be + used to install a plugin that consists of a pair of feature and plugin JARs. + This function takes an argument { name, srcFeature, srcPlugin + } where srcFeature and + srcPlugin are the feature and plugin JARs, respectively. - Expanding the previous example with two plugins using the above - functions we have + Expanding the previous example with two plugins using the above functions we + have packageOverrides = pkgs: { myEclipse = with pkgs.eclipses; eclipseWithPlugins { @@ -343,210 +306,214 @@ packageOverrides = pkgs: { } +
+
+ Elm -
+ + The Nix expressions for Elm reside in + pkgs/development/compilers/elm. They are generated + automatically by update-elm.rb script. One should specify + versions of Elm packages inside the script, clear the + packages directory and run the script from inside it. + elm-reactor is special because it also has Elm package + dependencies. The process is not automated very much for now -- you should + get the elm-reactor source tree (e.g. with + nix-shell) and run elm2nix.rb inside + it. Place the resulting package.nix file into + packages/elm-reactor-elm.nix. + +
+
+ Interactive shell helpers -
- -Elm - - -The Nix expressions for Elm reside in -pkgs/development/compilers/elm. They are generated -automatically by update-elm.rb script. One should -specify versions of Elm packages inside the script, clear the -packages directory and run the script from inside it. -elm-reactor is special because it also has Elm package -dependencies. The process is not automated very much for now -- you should -get the elm-reactor source tree (e.g. with -nix-shell) and run elm2nix.rb inside -it. Place the resulting package.nix file into -packages/elm-reactor-elm.nix. - - -
- -
- -Interactive shell helpers - - - Some packages provide the shell integration to be more useful. But - unlike other systems, nix doesn't have a standard share directory - location. This is why a bunch PACKAGE-share - scripts are shipped that print the location of the corresponding - shared folder. - - Current list of such packages is as following: - - + + Some packages provide the shell integration to be more useful. But unlike + other systems, nix doesn't have a standard share directory location. This is + why a bunch PACKAGE-share scripts are shipped that print + the location of the corresponding shared folder. Current list of such + packages is as following: + - - autojump: autojump-share - + + autojump: autojump-share + - - fzf: fzf-share - + + fzf: fzf-share + - - - E.g. autojump can then used in the .bashrc like this: + + E.g. autojump can then used in the .bashrc like this: source "$(autojump-share)/autojump.bash" - + +
+
+ Steam -
+
+ Steam in Nix -
+ + Steam is distributed as a .deb file, for now only as + an i686 package (the amd64 package only has documentation). When unpacked, + it has a script called steam that in ubuntu (their + target distro) would go to /usr/bin . When run for the + first time, this script copies some files to the user's home, which include + another script that is the ultimate responsible for launching the steam + binary, which is also in $HOME. + -Steam + + Nix problems and constraints: + + + + We don't have /bin/bash and many scripts point + there. Similarly for /usr/bin/python . + + + + + We don't have the dynamic loader in /lib . + + + + + The steam.sh script in $HOME can not be patched, as + it is checked and rewritten by steam. + + + + + The steam binary cannot be patched, it's also checked. + + + + -
+ + The current approach to deploy Steam in NixOS is composing a FHS-compatible + chroot environment, as documented + here. + This allows us to have binaries in the expected paths without disrupting + the system, and to avoid patching them to work in a non FHS environment. + +
-Steam in Nix +
+ How to play - - Steam is distributed as a .deb file, for now only - as an i686 package (the amd64 package only has documentation). - When unpacked, it has a script called steam that - in ubuntu (their target distro) would go to /usr/bin - . When run for the first time, this script copies some - files to the user's home, which include another script that is the - ultimate responsible for launching the steam binary, which is also - in $HOME. - - - Nix problems and constraints: - - We don't have /bin/bash and many - scripts point there. Similarly for /usr/bin/python - . - We don't have the dynamic loader in /lib - . - The steam.sh script in $HOME can - not be patched, as it is checked and rewritten by steam. - The steam binary cannot be patched, it's also checked. - - - - The current approach to deploy Steam in NixOS is composing a FHS-compatible - chroot environment, as documented - here. - This allows us to have binaries in the expected paths without disrupting the system, - and to avoid patching them to work in a non FHS environment. - - -
- -
- -How to play - - - For 64-bit systems it's important to have - hardware.opengl.driSupport32Bit = true; - in your /etc/nixos/configuration.nix. You'll also need - hardware.pulseaudio.support32Bit = true; - if you are using PulseAudio - this will enable 32bit ALSA apps integration. - To use the Steam controller, you need to add - services.udev.extraRules = '' + + For 64-bit systems it's important to have +hardware.opengl.driSupport32Bit = true; + in your /etc/nixos/configuration.nix. You'll also need +hardware.pulseaudio.support32Bit = true; + if you are using PulseAudio - this will enable 32bit ALSA apps integration. + To use the Steam controller, you need to add +services.udev.extraRules = '' SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666" KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput" ''; - to your configuration. - + to your configuration. + +
-
+
+ Troubleshooting -
+ + + + Steam fails to start. What do I do? + + + Try to run +strace steam + to see what is causing steam to fail. + + + + + Using the FOSS Radeon or nouveau (nvidia) drivers + + + + + The newStdcpp parameter was removed since NixOS + 17.09 and should not be needed anymore. + + + + + Steam ships statically linked with a version of libcrypto that + conflics with the one dynamically loaded by radeonsi_dri.so. If you + get the error +steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at + this + pull request. + + + + + + + Java + + + + + There is no java in steam chrootenv by default. If you get a message + like +/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + You need to add + steam.override { withJava = true; }; + to your configuration. + + + + + + + +
-Troubleshooting +
+ steam-run - - - - - Steam fails to start. What do I do? - Try to run - strace steam - to see what is causing steam to fail. - - - - Using the FOSS Radeon or nouveau (nvidia) drivers - - The newStdcpp parameter - was removed since NixOS 17.09 and should not be needed anymore. - - - - Steam ships statically linked with a version of libcrypto that - conflics with the one dynamically loaded by radeonsi_dri.so. - If you get the error - steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at this pull request. - - - - - - Java - - - There is no java in steam chrootenv by default. If you get a message like - /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - You need to add - steam.override { withJava = true; }; - to your configuration. - - - - - - -
- -
- -steam-run - -The FHS-compatible chroot used for steam can also be used to run -other linux games that expect a FHS environment. -To do it, add + + The FHS-compatible chroot used for steam can also be used to run other + linux games that expect a FHS environment. To do it, add pkgs.(steam.override { nativeOnly = true; newStdcpp = true; }).run -to your configuration, rebuild, and run the game with + to your configuration, rebuild, and run the game with steam-run ./foo - + +
+
+
+ Emacs -
+
+ Configuring Emacs -
- -
- -Emacs - -
- -Configuring Emacs - - - The Emacs package comes with some extra helpers to make it easier to - configure. emacsWithPackages allows you to manage - packages from ELPA. This means that you will not have to install - that packages from within Emacs. For instance, if you wanted to use - company, counsel, - flycheck, ivy, - magit, projectile, and - use-package you could use this as a - ~/.config/nixpkgs/config.nix override: - + + The Emacs package comes with some extra helpers to make it easier to + configure. emacsWithPackages allows you to manage + packages from ELPA. This means that you will not have to install that + packages from within Emacs. For instance, if you wanted to use + company, counsel, + flycheck, ivy, + magit, projectile, and + use-package you could use this as a + ~/.config/nixpkgs/config.nix override: + { @@ -564,17 +531,17 @@ to your configuration, rebuild, and run the game with } - - You can install it like any other packages via nix-env -iA - myEmacs. However, this will only install those packages. - It will not configure them for us. To do this, we - need to provide a configuration file. Luckily, it is possible to do - this from within Nix! By modifying the above example, we can make - Emacs load a custom config file. The key is to create a package that - provide a default.el file in - /share/emacs/site-start/. Emacs knows to load - this file automatically when it starts. - + + You can install it like any other packages via nix-env -iA + myEmacs. However, this will only install those packages. It will + not configure them for us. To do this, we need to + provide a configuration file. Luckily, it is possible to do this from + within Nix! By modifying the above example, we can make Emacs load a custom + config file. The key is to create a package that provide a + default.el file in + /share/emacs/site-start/. Emacs knows to load this + file automatically when it starts. + { @@ -654,25 +621,24 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el } - - This provides a fairly full Emacs start file. It will load in - addition to the user's presonal config. You can always disable it by - passing -q to the Emacs command. - + + This provides a fairly full Emacs start file. It will load in addition to + the user's presonal config. You can always disable it by passing + -q to the Emacs command. + - - Sometimes emacsWithPackages is not enough, as - this package set has some priorities imposed on packages (with - the lowest priority assigned to Melpa Unstable, and the highest for - packages manually defined in - pkgs/top-level/emacs-packages.nix). But you - can't control this priorities when some package is installed as a - dependency. You can override it on per-package-basis, providing all - the required dependencies manually - but it's tedious and there is - always a possibility that an unwanted dependency will sneak in - through some other package. To completely override such a package - you can use overrideScope. - + + Sometimes emacsWithPackages is not enough, as this + package set has some priorities imposed on packages (with the lowest + priority assigned to Melpa Unstable, and the highest for packages manually + defined in pkgs/top-level/emacs-packages.nix). But you + can't control this priorities when some package is installed as a + dependency. You can override it on per-package-basis, providing all the + required dependencies manually - but it's tedious and there is always a + possibility that an unwanted dependency will sneak in through some other + package. To completely override such a package you can use + overrideScope. + overrides = super: self: rec { @@ -685,34 +651,34 @@ overrides = super: self: rec { dante ]) +
+
+
+ Weechat -
- -
- -
-Weechat - -Weechat can be configured to include your choice of plugins, reducing its -closure size from the default configuration which includes all available -plugins. To make use of this functionality, install an expression that -overrides its configuration such as + + Weechat can be configured to include your choice of plugins, reducing its + closure size from the default configuration which includes all available + plugins. To make use of this functionality, install an expression that + overrides its configuration such as weechat.override {configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ python perl ]; } } - - -The plugins currently available are python, -perl, ruby, guile, -tcl and lua. - - -The python plugin allows the addition of extra libraries. For instance, -the inotify.py script in weechat-scripts requires -D-Bus or libnotify, and the fish.py script requires -pycrypto. To use these scripts, use the python -plugin's withPackages attribute: + + + + The plugins currently available are python, + perl, ruby, guile, + tcl and lua. + + + + The python plugin allows the addition of extra libraries. For instance, the + inotify.py script in weechat-scripts requires D-Bus or + libnotify, and the fish.py script requires pycrypto. To + use these scripts, use the python plugin's + withPackages attribute: weechat.override { configure = {availablePlugins, ...}: { plugins = with availablePlugins; [ (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) @@ -720,16 +686,17 @@ plugin's withPackages attribute: } } - - -In order to also keep all default plugins installed, it is possible to use -the following method: + + + + In order to also keep all default plugins installed, it is possible to use + the following method: weechat.override { configure = { availablePlugins, ... }: { plugins = builtins.attrValues (availablePlugins // { python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); }); }; } - -
+ +
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index f4f6ec600294..b2c20c2d35c0 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -1,27 +1,25 @@ + Platform Notes +
+ Darwin (macOS) -Platform Notes + + Some common issues when packaging software for darwin: + -
- -Darwin (macOS) -Some common issues when packaging software for darwin: - - - - + + - The darwin stdenv uses clang instead of gcc. - When referring to the compiler $CC or cc - will work in both cases. Some builds hardcode gcc/g++ in their - build scripts, that can usually be fixed with using something - like makeFlags = [ "CC=cc" ]; or by patching - the build scripts. + The darwin stdenv uses clang instead of gcc. When + referring to the compiler $CC or cc + will work in both cases. Some builds hardcode gcc/g++ in their build + scripts, that can usually be fixed with using something like + makeFlags = [ "CC=cc" ]; or by patching the build + scripts. - - + stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... @@ -30,36 +28,33 @@ ''; } - - - + + - On darwin libraries are linked using absolute paths, libraries - are resolved by their install_name at link - time. Sometimes packages won't set this correctly causing the - library lookups to fail at runtime. This can be fixed by adding - extra linker flags or by running install_name_tool -id - during the fixupPhase. + On darwin libraries are linked using absolute paths, libraries are + resolved by their install_name at link time. Sometimes + packages won't set this correctly causing the library lookups to fail at + runtime. This can be fixed by adding extra linker flags or by running + install_name_tool -id during the + fixupPhase. - - + stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; } - - - + + - Some packages assume xcode is available and use xcrun - to resolve build tools like clang, etc. - This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' - while the build doesn't actually depend on xcode. + Some packages assume xcode is available and use xcrun + to resolve build tools like clang, etc. This causes + errors like xcode-select: error: no developer tools were found at + '/Applications/Xcode.app' while the build doesn't actually depend + on xcode. - - + stdenv.mkDerivation { name = "libfoo-1.2.3"; # ... @@ -69,15 +64,12 @@ ''; } - - The package xcbuild can be used to build projects - that really depend on Xcode, however projects that build some kind of - graphical interface won't work without using Xcode in an impure way. + The package xcbuild can be used to build projects that + really depend on Xcode, however projects that build some kind of graphical + interface won't work without using Xcode in an impure way. - - - -
- + + +
diff --git a/doc/quick-start.xml b/doc/quick-start.xml index ca86e6c9519b..0cba3a4769c4 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -1,223 +1,219 @@ - -Quick Start to Adding a Package - -To add a package to Nixpkgs: - - - - - Checkout the Nixpkgs source tree: - + Quick Start to Adding a Package + + To add a package to Nixpkgs: + + + + Checkout the Nixpkgs source tree: $ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs - - - - - Find a good place in the Nixpkgs tree to add the Nix - expression for your package. For instance, a library package - typically goes into - pkgs/development/libraries/pkgname, - while a web browser goes into - pkgs/applications/networking/browsers/pkgname. - See for some hints on the tree - organisation. Create a directory for your package, e.g. - + + + + Find a good place in the Nixpkgs tree to add the Nix expression for your + package. For instance, a library package typically goes into + pkgs/development/libraries/pkgname, + while a web browser goes into + pkgs/applications/networking/browsers/pkgname. + See for some hints on the tree + organisation. Create a directory for your package, e.g. $ mkdir pkgs/development/libraries/libfoo - - - - - In the package directory, create a Nix expression — a piece - of code that describes how to build the package. In this case, it - should be a function that is called with the - package dependencies as arguments, and returns a build of the - package in the Nix store. The expression should usually be called - default.nix. - + + + + In the package directory, create a Nix expression — a piece of code that + describes how to build the package. In this case, it should be a + function that is called with the package dependencies + as arguments, and returns a build of the package in the Nix store. The + expression should usually be called default.nix. $ emacs pkgs/development/libraries/libfoo/default.nix $ git add pkgs/development/libraries/libfoo/default.nix - - - You can have a look at the existing Nix expressions under - pkgs/ to see how it’s done. Here are some - good ones: - - - - - GNU Hello: + You can have a look at the existing Nix expressions under + pkgs/ to see how it’s done. Here are some good + ones: + + + + GNU Hello: + pkgs/applications/misc/hello/default.nix. - Trivial package, which specifies some meta - attributes which is good practice. - - - - GNU cpio: meta + attributes which is good practice. + + + + + GNU cpio: + pkgs/tools/archivers/cpio/default.nix. - Also a simple package. The generic builder in - stdenv does everything for you. It has - no dependencies beyond stdenv. - - - - GNU Multiple Precision arithmetic library (GMP): stdenv + does everything for you. It has no dependencies beyond + stdenv. + + + + + GNU Multiple Precision arithmetic library (GMP): + pkgs/development/libraries/gmp/5.1.x.nix. - Also done by the generic builder, but has a dependency on - m4. - - - - Pan, a GTK-based newsreader: m4. + + + + + Pan, a GTK-based newsreader: + pkgs/applications/networking/newsreaders/pan/default.nix. - Has an optional dependency on gtkspell, - which is only built if spellCheck is - true. - - - - Apache HTTPD: gtkspell, which is + only built if spellCheck is true. + + + + + Apache HTTPD: + pkgs/servers/http/apache-httpd/2.4.nix. - A bunch of optional features, variable substitutions in the - configure flags, a post-install hook, and miscellaneous - hackery. - - - - Thunderbird: + + + + Thunderbird: + pkgs/applications/networking/mailreaders/thunderbird/default.nix. - Lots of dependencies. - - - - JDiskReport, a Java utility: + + + + JDiskReport, a Java utility: + pkgs/tools/misc/jdiskreport/default.nix - (and the builder). - Nixpkgs doesn’t have a decent stdenv for - Java yet so this is pretty ad-hoc. - - - - XML::Simple, a Perl module: stdenv for Java yet + so this is pretty ad-hoc. + + + + + XML::Simple, a Perl module: + pkgs/top-level/perl-packages.nix - (search for the XMLSimple attribute). - Most Perl modules are so simple to build that they are - defined directly in perl-packages.nix; - no need to make a separate file for them. - - - - Adobe Reader: XMLSimple attribute). Most Perl + modules are so simple to build that they are defined directly in + perl-packages.nix; no need to make a separate file + for them. + + + + + Adobe Reader: + pkgs/applications/misc/adobe-reader/default.nix. - Shows how binary-only packages can be supported. In - particular the builder - uses patchelf to set the RUNPATH and ELF - interpreter of the executables so that the right libraries - are found at runtime. - - - - + uses patchelf to set the RUNPATH and ELF interpreter + of the executables so that the right libraries are found at runtime. + + + - - Some notes: - - - - - All meta - attributes are optional, but it’s still a good idea to - provide at least the description, - homepage and license. - - - - You can use nix-prefetch-url (or similar nix-prefetch-git, etc) - url to get the SHA-256 hash of - source distributions. There are similar commands as nix-prefetch-git and - nix-prefetch-hg available in nix-prefetch-scripts package. - - - - A list of schemes for mirror:// - URLs can be found in pkgs/build-support/fetchurl/mirrors.nix. - - - - + + Some notes: + + + + All meta attributes are + optional, but it’s still a good idea to provide at least the + description, homepage and + license. + + + + + You can use nix-prefetch-url (or similar + nix-prefetch-git, etc) url to get the + SHA-256 hash of source distributions. There are similar commands as + nix-prefetch-git and + nix-prefetch-hg available in + nix-prefetch-scripts package. + + + + + A list of schemes for mirror:// URLs can be found in + pkgs/build-support/fetchurl/mirrors.nix. + + + - - The exact syntax and semantics of the Nix expression - language, including the built-in function, are described in the - Nix manual in the + The exact syntax and semantics of the Nix expression language, including + the built-in function, are described in the Nix manual in the + chapter - on writing Nix expressions. - - - - - Add a call to the function defined in the previous step to - . + + + + + Add a call to the function defined in the previous step to + pkgs/top-level/all-packages.nix - with some descriptive name for the variable, - e.g. libfoo. - - + with some descriptive name for the variable, e.g. + libfoo. + $ emacs pkgs/top-level/all-packages.nix - - - The attributes in that file are sorted by category (like - “Development / Libraries”) that more-or-less correspond to the - directory structure of Nixpkgs, and then by attribute name. - - - - To test whether the package builds, run the following command - from the root of the nixpkgs source tree: - - + + The attributes in that file are sorted by category (like “Development / + Libraries”) that more-or-less correspond to the directory structure of + Nixpkgs, and then by attribute name. + + + + + To test whether the package builds, run the following command from the + root of the nixpkgs source tree: + $ nix-build -A libfoo - - where libfoo should be the variable name - defined in the previous step. You may want to add the flag - to keep the temporary build directory in case - something fails. If the build succeeds, a symlink - ./result to the package in the Nix store is - created. - - - - If you want to install the package into your profile - (optional), do - - -$ nix-env -f . -iA libfoo - + where libfoo should be the variable name defined in the + previous step. You may want to add the flag to keep + the temporary build directory in case something fails. If the build + succeeds, a symlink ./result to the package in the + Nix store is created. - - - - Optionally commit the new package and open a pull request, or send a patch to - https://groups.google.com/forum/#!forum/nix-devel. - - - - - - - + + + + If you want to install the package into your profile (optional), do + +$ nix-env -f . -iA libfoo + + + + + Optionally commit the new package and open a pull request, or send a patch + to https://groups.google.com/forum/#!forum/nix-devel. + + + + diff --git a/doc/release-notes.xml b/doc/release-notes.xml index a50ee877acdd..6dae6ae5620e 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -1,164 +1,177 @@
+ Nixpkgs Release Notes +
+ Release 0.14 (June 4, 2012) -Nixpkgs Release Notes + + In preparation for the switch from Subversion to Git, this release is mainly + the prevent the Nixpkgs version number from going backwards. (This would + happen because prerelease version numbers produced for the Git repository + are lower than those for the Subversion repository.) + + + Since the last release, there have been thousands of changes and new + packages by numerous contributors. For details, see the commit logs. + +
+
+ Release 0.13 (February 5, 2010) -
Release 0.14 (June 4, 2012) + + As always, there are many changes. Some of the most important updates are: + + + + Glibc 2.9. + + + + + GCC 4.3.3. + + + + + Linux 2.6.32. + + + + + X.org 7.5. + + + + + KDE 4.3.4. + + + + +
+
+ Release 0.12 (April 24, 2009) -In preparation for the switch from Subversion to Git, this -release is mainly the prevent the Nixpkgs version number from going -backwards. (This would happen because prerelease version numbers -produced for the Git repository are lower than those for the -Subversion repository.) + + There are way too many additions to Nixpkgs since the last release to list + here: for example, the number of packages on Linux has increased from 1002 + to 2159. However, some specific improvements are worth listing: + + + + Nixpkgs now has a manual. In particular, it describes the standard build + environment in detail. + + + + + Major new packages: + + + + KDE 4. + + + + + TeXLive. + + + + + VirtualBox. + + + + … and many others. + + + + + Important updates: + + + + Glibc 2.7. + + + + + GCC 4.2.4. + + + + + Linux 2.6.25 — 2.6.28. + + + + + Firefox 3. + + + + + X.org 7.3. + + + + + + + + Support for building derivations in a virtual machine, including RPM and + Debian builds in automatically generated VM images. See + pkgs/build-support/vm/default.nix for details. + + + + + Improved support for building Haskell packages. + + + + -Since the last release, there have been thousands of changes and -new packages by numerous contributors. For details, see the commit -logs. - -
- - -
Release 0.13 (February 5, 2010) - -As always, there are many changes. Some of the most important -updates are: - - - - Glibc 2.9. - - GCC 4.3.3. - - Linux 2.6.32. - - X.org 7.5. - - KDE 4.3.4. - - - - - - -
- - -
Release 0.12 (April 24, 2009) - -There are way too many additions to Nixpkgs since the last -release to list here: for example, the number of packages on Linux has -increased from 1002 to 2159. However, some specific improvements are -worth listing: - - - - Nixpkgs now has a manual. In particular, it - describes the standard build environment in - detail. - - Major new packages: - - - - KDE 4. - - TeXLive. - - VirtualBox. - - - - … and many others. - - - - Important updates: - - - - Glibc 2.7. - - GCC 4.2.4. - - Linux 2.6.25 — 2.6.28. - - Firefox 3. - - X.org 7.3. - - - - - - Support for building derivations in a virtual - machine, including RPM and Debian builds in automatically generated - VM images. See - pkgs/build-support/vm/default.nix for - details. - - Improved support for building Haskell - packages. - - - - - -The following people contributed to this release: - -Andres Löh, -Arie Middelkoop, -Armijn Hemel, -Eelco Dolstra, -Lluís Batlle, -Ludovic Courtès, -Marc Weber, -Mart Kolthof, -Martin Bravenboer, -Michael Raskin, -Nicolas Pierron, -Peter Simons, -Pjotr Prins, -Rob Vermaas, -Sander van der Burg, -Tobias Hammerschmidt, -Valentin David, -Wouter den Breejen and -Yury G. Kudryashov. - -In addition, several people contributed patches on the -nix-dev mailing list. - -
- - -
Release 0.11 (September 11, 2007) - -This release has the following improvements: - - - - - The standard build environment - (stdenv) is now pure on the - x86_64-linux and powerpc-linux - platforms, just as on i686-linux. (Purity means - that building and using the standard environment has no dependencies - outside of the Nix store. For instance, it doesn’t require an - external C compiler such as /usr/bin/gcc.) - Also, the statically linked binaries used in the bootstrap process - are now automatically reproducible, making it easy to update the - bootstrap tools and to add support for other Linux platforms. See - pkgs/stdenv/linux/make-bootstrap-tools.nix for - details. - - - Hook variables in the generic builder are now - executed using the eval shell command. This - has a major advantage: you can write hooks directly in Nix - expressions. For instance, rather than writing a builder like this: + + The following people contributed to this release: Andres Löh, Arie + Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, + Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas + Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias + Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In + addition, several people contributed patches on the + nix-dev mailing list. + +
+
+ Release 0.11 (September 11, 2007) + + This release has the following improvements: + + + + The standard build environment (stdenv) is now pure on + the x86_64-linux and powerpc-linux + platforms, just as on i686-linux. (Purity means that + building and using the standard environment has no dependencies outside + of the Nix store. For instance, it doesn’t require an external C + compiler such as /usr/bin/gcc.) Also, the statically + linked binaries used in the bootstrap process are now automatically + reproducible, making it easy to update the bootstrap tools and to add + support for other Linux platforms. See + pkgs/stdenv/linux/make-bootstrap-tools.nix for + details. + + + + + Hook variables in the generic builder are now executed using the + eval shell command. This has a major advantage: you + can write hooks directly in Nix expressions. For instance, rather than + writing a builder like this: source $stdenv/setup @@ -169,290 +182,311 @@ postInstall() { } genericBuild - - (the gzip builder), you can just add this - attribute to the derivation: - + (the gzip builder), you can just add this attribute to + the derivation: postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat"; - - and so a separate build script becomes unnecessary. This should - allow us to get rid of most builders in Nixpkgs. - - - It is now possible to have the generic builder pass - arguments to configure and - make that contain whitespace. Previously, for - example, you could say in a builder, - + and so a separate build script becomes unnecessary. This should allow us + to get rid of most builders in Nixpkgs. + + + + + It is now possible to have the generic builder pass arguments to + configure and make that contain + whitespace. Previously, for example, you could say in a builder, configureFlags="CFLAGS=-O0" - - but not - + but not configureFlags="CFLAGS=-O0 -g" - - since the -g would be interpreted as a separate - argument to configure. Now you can say - + since the -g would be interpreted as a separate + argument to configure. Now you can say configureFlagsArray=("CFLAGS=-O0 -g") - - or similarly - + or similarly configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar") - - which does the right thing. Idem for makeFlags, - installFlags, checkFlags and - distFlags. - - Unfortunately you can't pass arrays to Bash through the - environment, so you can't put the array above in a Nix expression, - e.g., - + which does the right thing. Idem for makeFlags, + installFlags, checkFlags and + distFlags. + + + Unfortunately you can't pass arrays to Bash through the environment, so + you can't put the array above in a Nix expression, e.g., configureFlagsArray = ["CFLAGS=-O0 -g"]; - - since it would just be flattened to a since string. However, you - can use the inline hooks described above: - + since it would just be flattened to a since string. However, you + can use the inline hooks described above: preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")"; - - - - - The function fetchurl now has - support for two different kinds of mirroring of files. First, it - has support for content-addressable mirrors. - For example, given the fetchurl call - + + + + + The function fetchurl now has support for two + different kinds of mirroring of files. First, it has support for + content-addressable mirrors. For example, given the + fetchurl call fetchurl { url = http://releases.mozilla.org/.../firefox-2.0.0.6-source.tar.bz2; sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"; } - - fetchurl will first try to download this file - from fetchurl will first try to download this file from + . - If that file doesn’t exist, it will try the original URL. In - general, the “content-addressed” location is - mirror/hash-type/hash. - There is currently only one content-addressable mirror (mirror/hash-type/hash. + There is currently only one content-addressable mirror + (), but more can be - specified in the hashedMirrors attribute in - pkgs/build-support/fetchurl/mirrors.nix, or by - setting the NIX_HASHED_MIRRORS environment variable - to a whitespace-separated list of URLs. - - Second, fetchurl has support for - widely-mirrored distribution sites such as SourceForge or the Linux - kernel archives. Given a URL of the form - mirror://site/path, - it will try to download path from a - configurable list of mirrors for site. - (This idea was borrowed from Gentoo Linux.) Example: + specified in the hashedMirrors attribute in + pkgs/build-support/fetchurl/mirrors.nix, or by + setting the NIX_HASHED_MIRRORS environment variable to a + whitespace-separated list of URLs. + + + Second, fetchurl has support for widely-mirrored + distribution sites such as SourceForge or the Linux kernel archives. + Given a URL of the form + mirror://site/path, + it will try to download path from a + configurable list of mirrors for site. (This + idea was borrowed from Gentoo Linux.) Example: fetchurl { url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2; sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1"; } - Currently site can be - sourceforge, gnu and - kernel. The list of mirrors is defined in - pkgs/build-support/fetchurl/mirrors.nix. You - can override the list of mirrors for a particular site by setting - the environment variable - NIX_MIRRORS_site, e.g. + Currently site can be + sourceforge, gnu and + kernel. The list of mirrors is defined in + pkgs/build-support/fetchurl/mirrors.nix. You can + override the list of mirrors for a particular site by setting the + environment variable + NIX_MIRRORS_site, e.g. export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/ + + + + + Important updates: + + + + Glibc 2.5. + + + + + GCC 4.1.2. + + + + + Gnome 2.16.3. + + + + + X11R7.2. + + + + + Linux 2.6.21.7 and 2.6.22.6. + + + + + Emacs 22.1. + + + + + + + + Major new packages: + + + + KDE 3.5.6 Base. + + + + + Wine 0.9.43. + + + + + OpenOffice 2.2.1. + + + + + Many Linux system packages to support NixOS. + + + + + + - + + The following people contributed to this release: Andres Löh, Arie + Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin + Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov. + +
+
+ Release 0.10 (October 12, 2006) + + + This release of Nixpkgs requires + Nix 0.10 + or higher. + + - Important updates: - - - - Glibc 2.5. - - GCC 4.1.2. - - Gnome 2.16.3. - - X11R7.2. - - Linux 2.6.21.7 and 2.6.22.6. - - Emacs 22.1. - - - - - - - Major new packages: - - - - KDE 3.5.6 Base. - - Wine 0.9.43. - - OpenOffice 2.2.1. - - Many Linux system packages to support - NixOS. - - - - - - - - - -The following people contributed to this release: - - Andres Löh, - Arie Middelkoop, - Armijn Hemel, - Eelco Dolstra, - Marc Weber, - Mart Kolthof, - Martin Bravenboer, - Michael Raskin, - Wouter den Breejen and - Yury G. Kudryashov. - - - -
- - -
Release 0.10 (October 12, 2006) - -This release of Nixpkgs requires Nix -0.10 or higher. - -This release has the following improvements: - - - - pkgs/system/all-packages-generic.nix - is gone, we now just have - pkgs/top-level/all-packages.nix that contains - all available packages. This should cause much less confusion with - users. all-packages.nix is a function that by - default returns packages for the current platform, but you can - override this by specifying a different system - argument. - - Certain packages in Nixpkgs are now - user-configurable through a configuration file, i.e., without having - to edit the Nix expressions in Nixpkgs. For instance, the Firefox - provided in the Nixpkgs channel is built without the RealPlayer - plugin (for legal reasons). Previously, you could easily enable - RealPlayer support by editing the call to the Firefox function in - all-packages.nix, but such changes are not - respected when Firefox is subsequently updated through the Nixpkgs - channel. - - The Nixpkgs configuration file (found in - ~/.nixpkgs/config.nix or through the - NIXPKGS_CONFIG environment variable) is an attribute - set that contains configuration options that - all-packages.nix reads and uses for certain - packages. For instance, the following configuration file: + + This release has the following improvements: + + + + + pkgs/system/all-packages-generic.nix is gone, we now + just have pkgs/top-level/all-packages.nix that + contains all available packages. This should cause much less confusion + with users. all-packages.nix is a function that by + default returns packages for the current platform, but you can override + this by specifying a different system argument. + + + + + Certain packages in Nixpkgs are now user-configurable through a + configuration file, i.e., without having to edit the Nix expressions in + Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is + built without the RealPlayer plugin (for legal reasons). Previously, you + could easily enable RealPlayer support by editing the call to the Firefox + function in all-packages.nix, but such changes are + not respected when Firefox is subsequently updated through the Nixpkgs + channel. + + + The Nixpkgs configuration file (found in + ~/.nixpkgs/config.nix or through the + NIXPKGS_CONFIG environment variable) is an attribute set + that contains configuration options that + all-packages.nix reads and uses for certain packages. + For instance, the following configuration file: { firefox = { enableRealPlayer = true; }; } - - persistently enables RealPlayer support in the Firefox - build. - - (Actually, firefox.enableRealPlayer is the - only configuration option currently available, - but more are sure to be added.) - - Support for new platforms: - - - - i686-cygwin, i.e., Windows - (using Cygwin). - The standard environment on i686-cygwin by - default builds binaries for the Cygwin environment (i.e., it - uses Cygwin tools and produces executables that use the Cygwin - library). However, there is also a standard environment that - produces binaries that use MinGW. You can use it - by calling all-package.nix with the - stdenvType argument set to - "i686-mingw". - - i686-darwin, i.e., Mac OS X - on Intel CPUs. - - powerpc-linux. - - x86_64-linux, i.e., Linux on - 64-bit AMD/Intel CPUs. Unlike i686-linux, - this platform doesn’t have a pure stdenv - yet. - - - + persistently enables RealPlayer support in the Firefox build. - - - - The default compiler is now GCC 4.1.1. - - X11 updated to X.org’s X11R7.1. - - Notable new packages: - - - - Opera. - - Microsoft Visual C++ 2005 Express Edition and - the Windows SDK. - - - - In total there are now around 809 packages in Nixpkgs. - - - - - It is now much easier to - override the default C compiler and other tools in - stdenv for specific packages. - all-packages.nix provides two utility - functions for this purpose: overrideGCC and - overrideInStdenv. Both take a - stdenv and return an augmented - stdenv; the formed changes the C compiler, and - the latter adds additional packages to the front of - stdenv’s initial PATH, allowing - tools to be overridden. - - For instance, the package strategoxt - doesn’t build with the GNU Make in stdenv - (version 3.81), so we call it with an augmented - stdenv that uses GNU Make 3.80: - + + (Actually, firefox.enableRealPlayer is the + only configuration option currently available, but + more are sure to be added.) + + + + + Support for new platforms: + + + + i686-cygwin, i.e., Windows (using + Cygwin). The standard + environment on i686-cygwin by default builds + binaries for the Cygwin environment (i.e., it uses Cygwin tools and + produces executables that use the Cygwin library). However, there is + also a standard environment that produces binaries that use + MinGW. You can + use it by calling all-package.nix with the + stdenvType argument set to + "i686-mingw". + + + + + i686-darwin, i.e., Mac OS X on Intel CPUs. + + + + + powerpc-linux. + + + + + x86_64-linux, i.e., Linux on 64-bit AMD/Intel CPUs. + Unlike i686-linux, this platform doesn’t have a + pure stdenv yet. + + + + + + + + The default compiler is now GCC 4.1.1. + + + + + X11 updated to X.org’s X11R7.1. + + + + + Notable new packages: + + + + Opera. + + + + + Microsoft Visual C++ 2005 Express Edition and the Windows SDK. + + + + In total there are now around 809 packages in Nixpkgs. + + + + + It is now much easier to override the default C + compiler and other tools in stdenv for specific + packages. all-packages.nix provides two utility + functions for this purpose: overrideGCC and + overrideInStdenv. Both take a + stdenv and return an augmented + stdenv; the formed changes the C compiler, and the + latter adds additional packages to the front of + stdenv’s initial PATH, allowing tools + to be overridden. + + + For instance, the package strategoxt doesn’t build + with the GNU Make in stdenv (version 3.81), so we call + it with an augmented stdenv that uses GNU Make 3.80: strategoxt = (import ../development/compilers/strategoxt) { inherit fetchurl pkgconfig sdf aterm; @@ -460,44 +494,37 @@ strategoxt = (import ../development/compilers/strategoxt) { }; gnumake380 = ...; - - Likewise, there are many packages that don’t compile with the - default GCC (4.1.1), but that’s easily fixed: - + Likewise, there are many packages that don’t compile with the default + GCC (4.1.1), but that’s easily fixed: exult = import ../games/exult { inherit fetchurl SDL SDL_mixer zlib libpng unzip; stdenv = overrideGCC stdenv gcc34; }; - - - - - It has also become much easier to experiment with - changes to the stdenv setup script (which notably - contains the generic builder). Since edits to - pkgs/stdenv/generic/setup.sh trigger a rebuild - of everything, this was formerly quite painful. - But now stdenv contains a function to - “regenerate” stdenv with a different setup - script, allowing the use of a different setup script for specific - packages: - + + + + + It has also become much easier to experiment with changes to the + stdenv setup script (which notably contains the generic + builder). Since edits to pkgs/stdenv/generic/setup.sh + trigger a rebuild of everything, this was formerly + quite painful. But now stdenv contains a function to + “regenerate” stdenv with a different setup script, + allowing the use of a different setup script for specific packages: pkg = import ... { stdenv = stdenv.regenerate ./my-setup.sh; ... } - - - - - Packages can now have a human-readable - description field. Package descriptions are - shown by nix-env -qa --description. In addition, - they’re shown on the Nixpkgs release page. A description can be - added to a package as follows: - + + + + + Packages can now have a human-readable description + field. Package descriptions are shown by nix-env -qa + --description. In addition, they’re shown on the Nixpkgs + release page. A description can be added to a package as follows: stdenv.mkDerivation { name = "exult-1.2"; @@ -506,228 +533,268 @@ stdenv.mkDerivation { description = "A reimplementation of the Ultima VII game engine"; }; } - - The meta attribute is not passed to the builder, - so changes to the description do not trigger a rebuild. Additional - meta attributes may be defined in the future - (such as the URL of the package’s homepage, the license, - etc.). - - - - -The following people contributed to this release: - - Andres Löh, - Armijn Hemel, - Christof Douma, - Eelco Dolstra, - Eelco Visser, - Mart Kolthof, - Martin Bravenboer, - Merijn de Jonge, - Rob Vermaas and - Roy van den Broek. - - - -
- - -
Release 0.9 (January 31, 2006) - -There have been zillions of changes since the last release of -Nixpkgs. Many packages have been added or updated. The following are -some of the more notable changes: - - - - Distribution files have been moved to . - - The C library on Linux, Glibc, has been updated to - version 2.3.6. - - The default compiler is now GCC 3.4.5. GCC 4.0.2 is - also available. - - The old, unofficial Xlibs has been replaced by the - official modularised X11 distribution from X.org, i.e., X11R7.0. - X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs - though not all have been tested. It is now possible to build a - working X server (previously we only had X client libraries). We - use a fully Nixified X server on NixOS. - - The Sun JDK 5 has been purified, i.e., it doesn’t - require any non-Nix components such as - /lib/ld-linux.so.2. This means that Java - applications such as Eclipse and Azureus can run on - NixOS. - - Hardware-accelerated OpenGL support, used by games - like Quake 3 (which is now built from source). - - Improved support for FreeBSD on - x86. - - Improved Haskell support; e.g., the GHC build is now - pure. - - Some support for cross-compilation: cross-compiling - builds of GCC and Binutils, and cross-compiled builds of the C - library uClibc. - - Notable new packages: - - - - teTeX, including support for building LaTeX - documents using Nix (with automatic dependency - determination). - - Ruby. - - System-level packages to support NixOS, - e.g. Grub, GNU parted and so - on. - - ecj, the Eclipse Compiler for - Java, so we finally have a freely distributable compiler that - supports Java 5.0. - - php. - - The GIMP. - - Inkscape. - - GAIM. - - kdelibs. This allows us to - add KDE-based packages (such as - kcachegrind). - - - - - - - -The following people contributed to this release: - - Andres Löh, - Armijn Hemel, - Bogdan Dumitriu, - Christof Douma, - Eelco Dolstra, - Eelco Visser, - Mart Kolthof, - Martin Bravenboer, - Rob Vermaas and - Roy van den Broek. - - - -
- - -
Release 0.8 (April 11, 2005) - -This release is mostly to remain synchronised with the changed -hashing scheme in Nix 0.8. - -Notable updates: - - - - Adobe Reader 7.0 - - Various security updates (zlib 1.2.2, etc.) - - - - - -
- - -
Release 0.7 (March 14, 2005) - - - - - - The bootstrap process for the standard build - environment on Linux (stdenv-linux) has been improved. It is no - longer dependent in its initial bootstrap stages on the system - Glibc, GCC, and other tools. Rather, Nixpkgs contains a statically - linked bash and curl, and uses that to download other statically - linked tools. These are then used to build a Glibc and dynamically - linked versions of all other tools. - - This change also makes the bootstrap process faster. For - instance, GCC is built only once instead of three times. - - (Contributed by Armijn Hemel.) - - - - - - Tarballs used by Nixpkgs are now obtained from the same server - that hosts Nixpkgs (). This reduces the - risk of packages being unbuildable due to moved or deleted files on - various servers. - - - - - - There now is a generic mechanism for building Perl modules. - See the various Perl modules defined in - pkgs/system/all-packages-generic.nix. - - - - - - Notable new packages: - - - - Qt 3 - MySQL - MythTV - Mono - MonoDevelop (alpha) - Xine - + The meta attribute is not passed to the builder, so + changes to the description do not trigger a rebuild. Additional + meta attributes may be defined in the future (such as + the URL of the package’s homepage, the license, etc.). + + + + The following people contributed to this release: Andres Löh, Armijn Hemel, + Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin + Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek. +
+
+ Release 0.9 (January 31, 2006) - - - - - Notable updates: + + There have been zillions of changes since the last release of Nixpkgs. Many + packages have been added or updated. The following are some of the more + notable changes: + - - GCC 3.4.3 - Glibc 2.3.4 - GTK 2.6 - + + + Distribution files have been moved to + . + + + + + The C library on Linux, Glibc, has been updated to version 2.3.6. + + + + + The default compiler is now GCC 3.4.5. GCC 4.0.2 is also available. + + + + + The old, unofficial Xlibs has been replaced by the official modularised + X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) + packages, all of which are in Nixpkgs though not all have been tested. It + is now possible to build a working X server (previously we only had X + client libraries). We use a fully Nixified X server on NixOS. + + + + + The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix + components such as /lib/ld-linux.so.2. This means + that Java applications such as Eclipse and Azureus can run on NixOS. + + + + + Hardware-accelerated OpenGL support, used by games like Quake 3 (which is + now built from source). + + + + + Improved support for FreeBSD on x86. + + + + + Improved Haskell support; e.g., the GHC build is now pure. + + + + + Some support for cross-compilation: cross-compiling builds of GCC and + Binutils, and cross-compiled builds of the C library uClibc. + + + + + Notable new packages: + + + + teTeX, including support for building LaTeX documents using Nix (with + automatic dependency determination). + + + + + Ruby. + + + + + System-level packages to support NixOS, e.g. Grub, GNU + parted and so on. + + + + + ecj, the Eclipse Compiler for Java, so we finally + have a freely distributable compiler that supports Java 5.0. + + + + + php. + + + + + The GIMP. + + + + + Inkscape. + + + + + GAIM. + + + + + kdelibs. This allows us to add KDE-based packages + (such as kcachegrind). + + + + + + + The following people contributed to this release: Andres Löh, Armijn Hemel, + Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, + Martin Bravenboer, Rob Vermaas and Roy van den Broek. + +
+
+ Release 0.8 (April 11, 2005) + + + This release is mostly to remain synchronised with the changed hashing + scheme in Nix 0.8. - + + Notable updates: + + + + Adobe Reader 7.0 + + + + + Various security updates (zlib 1.2.2, etc.) + + + + +
+
+ Release 0.7 (March 14, 2005) - - -
- - + + + + The bootstrap process for the standard build environment on Linux + (stdenv-linux) has been improved. It is no longer dependent in its initial + bootstrap stages on the system Glibc, GCC, and other tools. Rather, + Nixpkgs contains a statically linked bash and curl, and uses that to + download other statically linked tools. These are then used to build a + Glibc and dynamically linked versions of all other tools. + + + This change also makes the bootstrap process faster. For instance, GCC is + built only once instead of three times. + + + (Contributed by Armijn Hemel.) + + + + + Tarballs used by Nixpkgs are now obtained from the same server that hosts + Nixpkgs (). This + reduces the risk of packages being unbuildable due to moved or deleted + files on various servers. + + + + + There now is a generic mechanism for building Perl modules. See the + various Perl modules defined in pkgs/system/all-packages-generic.nix. + + + + + Notable new packages: + + + + Qt 3 + + + + + MySQL + + + + + MythTV + + + + + Mono + + + + + MonoDevelop (alpha) + + + + + Xine + + + + + + + + Notable updates: + + + + GCC 3.4.3 + + + + + Glibc 2.3.4 + + + + + GTK 2.6 + + + + + + +
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 7b017f0a8cc4..b648691183b8 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -3,95 +3,148 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-reviewing-contributions"> - -Reviewing contributions - - - The following section is a draft and reviewing policy is still being - discussed. - - -The nixpkgs projects receives a fairly high number of contributions via - GitHub pull-requests. Reviewing and approving these is an important task and a - way to contribute to the project. - -The high change rate of nixpkgs make any pull request that is open for - long enough subject to conflicts that will require extra work from the - submitter or the merger. Reviewing pull requests in a timely manner and being + Reviewing contributions + + + The following section is a draft and reviewing policy is still being + discussed. + + + + The nixpkgs projects receives a fairly high number of contributions via + GitHub pull-requests. Reviewing and approving these is an important task and + a way to contribute to the project. + + + The high change rate of nixpkgs make any pull request that is open for long + enough subject to conflicts that will require extra work from the submitter + or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid these. GitHub provides sort - filters that can be used to see the most - recently and the and the + least - recently updated pull-requests. - We highly encourage looking at - this list of ready to merge, unreviewed pull requests. - -When reviewing a pull request, please always be nice and polite. + recently updated pull-requests. We highly encourage looking at + + this list of ready to merge, unreviewed pull requests. + + + When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important - to respect every community members and their work. - -GitHub provides reactions, they are a simple and quick way to provide + to respect every community members and their work. + + + GitHub provides reactions, they are a simple and quick way to provide feedback to pull-requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanations so the - submitter has directions to improve his contribution. - -Pull-requests reviews should include a list of what has been reviewed in a - comment, so other reviewers and mergers can know the state of the - review. - -All the review template samples provided in this section are generic and + submitter has directions to improve his contribution. + + + Pull-requests reviews should include a list of what has been reviewed in a + comment, so other reviewers and mergers can know the state of the review. + + + All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt - them to his liking. + them to his liking. + +
+ Package updates -
Package updates + + A package update is the most trivial and common type of pull-request. These + pull-requests mainly consist in updating the version part of the package + name and the source hash. + -A package update is the most trivial and common type of pull-request. - These pull-requests mainly consist in updating the version part of the package - name and the source hash. -It can happen that non trivial updates include patches or more complex - changes. + + It can happen that non trivial updates include patches or more complex + changes. + -Reviewing process: + + Reviewing process: + - - Add labels to the pull-request. (Requires commit - rights) + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: package (update) and any topic - label that fit the updated package. + + + 8.has: package (update) and any topic label that fit + the updated package. + + - - Ensure that the package versioning is fitting the - guidelines. - Ensure that the commit text is fitting the - guidelines. - Ensure that the package maintainers are notified. + + + + Ensure that the package versioning is fitting the guidelines. + + + + + Ensure that the commit text is fitting the guidelines. + + + + + Ensure that the package maintainers are notified. + - mention-bot usually notify GitHub users based on the - submitted changes, but it can happen that it misses some of the - package maintainers. + + + mention-bot usually notify GitHub users based on the submitted changes, + but it can happen that it misses some of the package maintainers. + + - - Ensure that the meta field contains correct - information. + + + + Ensure that the meta field contains correct information. + - License can change with version updates, so it should be - checked to be fitting upstream license. - If the package has no maintainer, a maintainer must be - set. This can be the update submitter or a community member that - accepts to take maintainership of the package. + + + License can change with version updates, so it should be checked to be + fitting upstream license. + + + + + If the package has no maintainer, a maintainer must be set. This can be + the update submitter or a community member that accepts to take + maintainership of the package. + + - - Ensure that the code contains no typos. - Building the package locally. + + + + Ensure that the code contains no typos. + + + + + Building the package locally. + - Pull-requests are often targeted to the master or staging - branch so building the pull-request locally as it is submitted can - trigger a large amount of source builds. - It is possible to rebase the changes on nixos-unstable or - nixpkgs-unstable for easier review by running the following commands - from a nixpkgs clone. + + + Pull-requests are often targeted to the master or staging branch so + building the pull-request locally as it is submitted can trigger a large + amount of source builds. + + + It is possible to rebase the changes on nixos-unstable or + nixpkgs-unstable for easier review by running the following commands + from a nixpkgs clone. $ git remote add channels https://github.com/NixOS/nixpkgs-channels.git @@ -100,43 +153,56 @@ $ git fetch origin pull/PRNUMBER/head $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - - - This should be done only once to be able to fetch channel - branches from the nixpkgs-channels repository. - - - Fetching the nixos-unstable branch. - - - Fetching the pull-request changes, PRNUMBER - is the number at the end of the pull-request title and - BASEBRANCH the base branch of the - pull-request. - - - Rebasing the pull-request changes to the nixos-unstable - branch. - - - - - - The nox - tool can be used to review a pull-request content in a single command. - It doesn't rebase on a channel branch so it might trigger multiple - source builds. PRNUMBER should be replaced by the - number at the end of the pull-request title. + + + + This should be done only once to be able to fetch channel branches + from the nixpkgs-channels repository. + + + + + Fetching the nixos-unstable branch. + + + + + Fetching the pull-request changes, PRNUMBER is the + number at the end of the pull-request title and + BASEBRANCH the base branch of the pull-request. + + + + + Rebasing the pull-request changes to the nixos-unstable branch. + + + + + + + + The nox tool can + be used to review a pull-request content in a single command. It doesn't + rebase on a channel branch so it might trigger multiple source builds. + PRNUMBER should be replaced by the number at the end + of the pull-request title. + $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" - + - - Running every binary. - + + + + Running every binary. + + + -Sample template for a package update review + + Sample template for a package update review ##### Reviewed points @@ -150,55 +216,105 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
+ + +
+
+ New packages -
New packages + + New packages are a common type of pull-requests. These pull requests + consists in adding a new nix-expression for a package. + -New packages are a common type of pull-requests. These pull requests - consists in adding a new nix-expression for a package. + + Reviewing process: + -Reviewing process: - - - Add labels to the pull-request. (Requires commit - rights) + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: package (new) and any topic - label that fit the new package. + + + 8.has: package (new) and any topic label that fit the + new package. + + - - Ensure that the package versioning is fitting the - guidelines. - Ensure that the commit name is fitting the - guidelines. - Ensure that the meta field contains correct - information. + + + + Ensure that the package versioning is fitting the guidelines. + + + + + Ensure that the commit name is fitting the guidelines. + + + + + Ensure that the meta field contains correct information. + - License must be checked to be fitting upstream - license. - Platforms should be set or the package will not get binary - substitutes. - A maintainer must be set, this can be the package - submitter or a community member that accepts to take maintainership of - the package. + + + License must be checked to be fitting upstream license. + + + + + Platforms should be set or the package will not get binary substitutes. + + + + + A maintainer must be set, this can be the package submitter or a + community member that accepts to take maintainership of the package. + + - - Ensure that the code contains no typos. - Ensure the package source. + + + + Ensure that the code contains no typos. + + + + + Ensure the package source. + - Mirrors urls should be used when - available. - The most appropriate function should be used (e.g. - packages from GitHub should use - fetchFromGitHub). + + + Mirrors urls should be used when available. + + + + + The most appropriate function should be used (e.g. packages from GitHub + should use fetchFromGitHub). + + - - Building the package locally. - Running every binary. - + + + + Building the package locally. + + + + + Running every binary. + + + -Sample template for a new package review + + Sample template for a new package review ##### Reviewed points @@ -220,58 +336,107 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
+ + +
+
+ Module updates -
Module updates + + Module updates are submissions changing modules in some ways. These often + contains changes to the options or introduce new options. + -Module updates are submissions changing modules in some ways. These often - contains changes to the options or introduce new options. + + Reviewing process + -Reviewing process - - - Add labels to the pull-request. (Requires commit - rights) + + + + Add labels to the pull-request. (Requires commit rights) + - 8.has: module (update) and any topic - label that fit the module. + + + 8.has: module (update) and any topic label that fit + the module. + + - - Ensure that the module maintainers are notified. + + + + Ensure that the module maintainers are notified. + - Mention-bot notify GitHub users based on the submitted - changes, but it can happen that it miss some of the package - maintainers. + + + Mention-bot notify GitHub users based on the submitted changes, but it + can happen that it miss some of the package maintainers. + + - - Ensure that the module tests, if any, are - succeeding. - Ensure that the introduced options are correct. + + + + Ensure that the module tests, if any, are succeeding. + + + + + Ensure that the introduced options are correct. + - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and - string types are deprecated). - Description, default and example should be - provided. + + + Type should be appropriate (string related types differs in their + merging capabilities, optionSet and + string types are deprecated). + + + + + Description, default and example should be provided. + + - - Ensure that option changes are backward compatible. + + + + Ensure that option changes are backward compatible. + - mkRenamedOptionModule and - mkAliasOptionModule functions provide way to make - option changes backward compatible. + + + mkRenamedOptionModule and + mkAliasOptionModule functions provide way to make + option changes backward compatible. + + - - Ensure that removed options are declared with - mkRemovedOptionModule - Ensure that changes that are not backward compatible are - mentioned in release notes. - Ensure that documentations affected by the change is - updated. - + + + + Ensure that removed options are declared with + mkRemovedOptionModule + + + + + Ensure that changes that are not backward compatible are mentioned in + release notes. + + + + + Ensure that documentations affected by the change is updated. + + + -Sample template for a module update review + + Sample template for a module update review ##### Reviewed points @@ -288,51 +453,89 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
+ + +
+
+ New modules -
New modules + + New modules submissions introduce a new module to NixOS. + -New modules submissions introduce a new module to NixOS. + + + + Add labels to the pull-request. (Requires commit rights) + + + + + 8.has: module (new) and any topic label that fit the + module. + + + + + + + Ensure that the module tests, if any, are succeeding. + + + + + Ensure that the introduced options are correct. + + + + + Type should be appropriate (string related types differs in their + merging capabilities, optionSet and + string types are deprecated). + + + + + Description, default and example should be provided. + + + + + + + Ensure that module meta field is present + + + + + Maintainers should be declared in meta.maintainers. + + + + + Module documentation should be declared with + meta.doc. + + + + + + + Ensure that the module respect other modules functionality. + + + + + For example, enabling a module should not open firewall ports by + default. + + + + + - - Add labels to the pull-request. (Requires commit - rights) - - 8.has: module (new) and any topic label - that fit the module. - - - Ensure that the module tests, if any, are - succeeding. - Ensure that the introduced options are correct. - - Type should be appropriate (string related types differs - in their merging capabilities, optionSet and - string types are deprecated). - Description, default and example should be - provided. - - - Ensure that module meta field is - present - - Maintainers should be declared in - meta.maintainers. - Module documentation should be declared with - meta.doc. - - - Ensure that the module respect other modules - functionality. - - For example, enabling a module should not open firewall - ports by default. - - - - -Sample template for a new module review + + Sample template for a new module review ##### Reviewed points @@ -350,32 +553,41 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" ##### Comments - -
+ + +
+
+ Other submissions -
Other submissions + + Other type of submissions requires different reviewing steps. + -Other type of submissions requires different reviewing steps. + + If you consider having enough knowledge and experience in a topic and would + like to be a long-term reviewer for related submissions, please contact the + current reviewers for that topic. They will give you information about the + reviewing process. The main reviewers for a topic can be hard to find as + there is no list, but checking past pull-requests to see who reviewed or + git-blaming the code to see who committed to that topic can give some hints. + -If you consider having enough knowledge and experience in a topic and - would like to be a long-term reviewer for related submissions, please contact - the current reviewers for that topic. They will give you information about the - reviewing process. -The main reviewers for a topic can be hard to find as there is no list, but -checking past pull-requests to see who reviewed or git-blaming the code to see -who committed to that topic can give some hints. + + Container system, boot system and library changes are some examples of the + pull requests fitting this category. + +
+
+ Merging pull-requests -Container system, boot system and library changes are some examples of the - pull requests fitting this category. + + It is possible for community members that have enough knowledge and + experience on a special topic to contribute by merging pull requests. + -
- -
Merging pull-requests - -It is possible for community members that have enough knowledge and - experience on a special topic to contribute by merging pull requests. - -TODO: add the procedure to request merging rights. + + TODO: add the procedure to request merging rights. + -In a case a contributor leaves definitively the Nix community, he should - create an issue or notify the mailing list with references of packages and - modules he maintains so the maintainership can be taken over by other - contributors. - -
+ + In a case a contributor leaves definitively the Nix community, he should + create an issue or notify the mailing list with references of packages and + modules he maintains so the maintainership can be taken over by other + contributors. + +
diff --git a/doc/shell.nix b/doc/shell.nix index 22590142ee1a..e8da2eaf16be 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,4 +1,5 @@ { pkgs ? import ../. {} }: (import ./default.nix).overrideAttrs (x: { buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; + }) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 31d3d0ca3c4e..78fa1d209b58 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1,27 +1,24 @@ + The Standard Environment + + The standard build environment in the Nix Packages collection provides an + environment for building Unix packages that does a lot of common build tasks + automatically. In fact, for Unix packages that use the standard + ./configure; make; make install build interface, you + don’t need to write a build script at all; the standard environment does + everything automatically. If stdenv doesn’t do what you + need automatically, you can easily customise or override the various build + phases. + +
+ Using <literal>stdenv</literal> -The Standard Environment - - -The standard build environment in the Nix Packages collection -provides an environment for building Unix packages that does a lot of -common build tasks automatically. In fact, for Unix packages that use -the standard ./configure; make; make install build -interface, you don’t need to write a build script at all; the standard -environment does everything automatically. If -stdenv doesn’t do what you need automatically, you -can easily customise or override the various build phases. - - -
Using -<literal>stdenv</literal> - -To build a package with the standard environment, you use the -function stdenv.mkDerivation, instead of the -primitive built-in function derivation, e.g. - + + To build a package with the standard environment, you use the function + stdenv.mkDerivation, instead of the primitive built-in + function derivation, e.g. stdenv.mkDerivation { name = "libfoo-1.2.3"; @@ -30,39 +27,35 @@ stdenv.mkDerivation { sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; }; } - -(stdenv needs to be in scope, so if you write this -in a separate Nix expression from -pkgs/all-packages.nix, you need to pass it as a -function argument.) Specifying a name and a -src is the absolute minimum you need to do. Many -packages have dependencies that are not provided in the standard -environment. It’s usually sufficient to specify those dependencies in -the buildInputs attribute: - + (stdenv needs to be in scope, so if you write this in a + separate Nix expression from pkgs/all-packages.nix, you + need to pass it as a function argument.) Specifying a + name and a src is the absolute minimum + you need to do. Many packages have dependencies that are not provided in the + standard environment. It’s usually sufficient to specify those + dependencies in the buildInputs attribute: stdenv.mkDerivation { name = "libfoo-1.2.3"; ... buildInputs = [libbar perl ncurses]; } + This attribute ensures that the bin subdirectories of + these packages appear in the PATH environment variable during + the build, that their include subdirectories are + searched by the C compiler, and so on. (See + for details.) + -This attribute ensures that the bin -subdirectories of these packages appear in the PATH -environment variable during the build, that their -include subdirectories are searched by the C -compiler, and so on. (See for -details.) - -Often it is necessary to override or modify some aspect of the -build. To make this easier, the standard environment breaks the -package build into a number of phases, all of -which can be overridden or modified individually: unpacking the -sources, applying patches, configuring, building, and installing. -(There are some others; see .) -For instance, a package that doesn’t supply a makefile but instead has -to be compiled “manually” could be handled like this: - + + Often it is necessary to override or modify some aspect of the build. To + make this easier, the standard environment breaks the package build into a + number of phases, all of which can be overridden or + modified individually: unpacking the sources, applying patches, configuring, + building, and installing. (There are some others; see + .) For instance, a package that doesn’t + supply a makefile but instead has to be compiled “manually” could be + handled like this: stdenv.mkDerivation { name = "fnord-4.5"; @@ -75,35 +68,33 @@ stdenv.mkDerivation { cp foo $out/bin ''; } + (Note the use of ''-style string literals, which are very + convenient for large multi-line script fragments because they don’t need + escaping of " and \, and because + indentation is intelligently removed.) + -(Note the use of ''-style string literals, which -are very convenient for large multi-line script fragments because they -don’t need escaping of " and \, -and because indentation is intelligently removed.) - -There are many other attributes to customise the build. These -are listed in . - -While the standard environment provides a generic builder, you -can still supply your own build script: + + There are many other attributes to customise the build. These are listed in + . + + + While the standard environment provides a generic builder, you can still + supply your own build script: stdenv.mkDerivation { name = "libfoo-1.2.3"; ... builder = ./builder.sh; } - -where the builder can do anything it wants, but typically starts with - + where the builder can do anything it wants, but typically starts with source $stdenv/setup - -to let stdenv set up the environment (e.g., process -the buildInputs). If you want, you can still use -stdenv’s generic builder: - + to let stdenv set up the environment (e.g., process the + buildInputs). If you want, you can still use + stdenv’s generic builder: source $stdenv/setup @@ -119,116 +110,186 @@ installPhase() { genericBuild + +
+
+ Tools provided by <literal>stdenv</literal> - + + The standard environment provides the following packages: + + + + The GNU C Compiler, configured with C and C++ support. + + + + + GNU coreutils (contains a few dozen standard Unix commands). + + + + + GNU findutils (contains find). + + + + + GNU diffutils (contains diff, cmp). + + + + + GNU sed. + + + + + GNU grep. + + + + + GNU awk. + + + + + GNU tar. + + + + + gzip, bzip2 and + xz. + + + + + GNU Make. It has been patched to provide nested output + that can be fed into the nix-log2xml command and + log2html stylesheet to create a structured, readable + output of the build steps performed by Make. + + + + + Bash. This is the shell used for all builders in the Nix Packages + collection. Not using /bin/sh removes a large source + of portability problems. + + + + + The patch command. + + + + -
+ + On Linux, stdenv also includes the + patchelf utility. + +
+
+ Specifying dependencies + + As described in the Nix manual, almost any *.drv store + path in a derivation's attribute set will induce a dependency on that + derivation. mkDerivation, however, takes a few attributes + intended to, between them, include all the dependencies of a package. This + is done both for structure and consistency, but also so that certain other + setup can take place. For example, certain dependencies need their bin + directories added to the PATH. That is built-in, but other + setup is done via a pluggable mechanism that works in conjunction with these + dependency attributes. See for details. + -
Tools provided by -<literal>stdenv</literal> + + Dependencies can be broken down along three axes: their host and target + platforms relative to the new derivation's, and whether they are propagated. + The platform distinctions are motivated by cross compilation; see + for exactly what each platform means. + + + The build platform is ignored because it is a mere implementation detail + of the package satisfying the dependency: As a general programming + principle, dependencies are always specified as + interfaces, not concrete implementation. + + + But even if one is not cross compiling, the platforms imply whether or not + the dependency is needed at run-time or build-time, a concept that makes + perfect sense outside of cross compilation. For now, the run-time/build-time + distinction is just a hint for mental clarity, but in the future it perhaps + could be enforced. + -The standard environment provides the following packages: + + The extension of PATH with dependencies, alluded to above, + proceeds according to the relative platforms alone. The process is carried + out only for dependencies whose host platform matches the new derivation's + build platform–i.e. which run on the platform where the new derivation + will be built. + + + Currently, that means for native builds all dependencies are put on the + PATH. But in the future that may not be the case for sake + of matching cross: the platforms would be assumed to be unique for native + and cross builds alike, so only the depsBuild* and + nativeBuildDependencies dependencies would affect the + PATH. + + + For each dependency dep of those dependencies, + dep/bin, if present, is + added to the PATH environment variable. + - + + The dependency is propagated when it forces some of its other-transitive + (non-immediate) downstream dependencies to also take it on as an immediate + dependency. Nix itself already takes a package's transitive dependencies + into account, but this propagation ensures nixpkgs-specific infrastructure + like setup hooks (mentioned above) also are run as if the propagated + dependency. + - The GNU C Compiler, configured with C and C++ - support. + + It is important to note dependencies are not necessary propagated as the + same sort of dependency that they were before, but rather as the + corresponding sort so that the platform rules still line up. The exact rules + for dependency propagation can be given by assigning each sort of dependency + two integers based one how it's host and target platforms are offset from + the depending derivation's platforms. Those offsets are given are given + below in the descriptions of each dependency list attribute. + Algorithmically, we traverse propagated inputs, accumulating every + propagated dep's propagated deps and adjusting them to account for the + "shift in perspective" described by the current dep's platform offsets. This + results in sort a transitive closure of the dependency relation, with the + offsets being approximately summed when two dependency links are combined. + We also prune transitive deps whose combined offsets go out-of-bounds, which + can be viewed as a filter over that transitive closure removing dependencies + that are blatantly absurd. + - GNU coreutils (contains a few dozen standard Unix - commands). - - GNU findutils (contains - find). - - GNU diffutils (contains diff, - cmp). - - GNU sed. - - GNU grep. - - GNU awk. - - GNU tar. - - gzip, bzip2 - and xz. - - GNU Make. It has been patched to provide - nested output that can be fed into the - nix-log2xml command and - log2html stylesheet to create a structured, - readable output of the build steps performed by - Make. - - Bash. This is the shell used for all builders in - the Nix Packages collection. Not using /bin/sh - removes a large source of portability problems. - - The patch - command. - - - - - -On Linux, stdenv also includes the -patchelf utility. - -
- - -
Specifying dependencies - - - As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. - mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. - This is done both for structure and consistency, but also so that certain other setup can take place. - For example, certain dependencies need their bin directories added to the PATH. - That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. - See for details. - - - Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. - The platform distinctions are motivated by cross compilation; see for exactly what each platform means. - - The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: - As a general programming principle, dependencies are always specified as interfaces, not concrete implementation. - - But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. - For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced. - - - The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone. - The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built. - - Currently, that means for native builds all dependencies are put on the PATH. - But in the future that may not be the case for sake of matching cross: - the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildDependencies dependencies would affect the PATH. - - For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable. - - - The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. - Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. - - - It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. - The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms. - Those offsets are given are given below in the descriptions of each dependency list attribute. - Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets. - This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. - We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. - - - We can define the process precisely with Natural Deduction using the inference rules. - This probably seems a bit obtuse, but so is the bash code that actually implements it! - - The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic. - - They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other! - + + We can define the process precisely with + Natural + Deduction using the inference rules. This probably seems a bit + obtuse, but so is the bash code that actually implements it! + + + The findInputs function, currently residing in + pkgs/stdenv/generic/setup.sh, implements the + propagation logic. + + + They're confusing in very different ways so...hopefully if something doesn't + make sense in one presentation, it does in the other! + let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) propagated-dep(h0, t0, A, B) @@ -239,7 +300,7 @@ h0 + t1 in {-1, 0, 1} propagated-dep(mapOffset(h0, t0, h1), mapOffset(h0, t0, t1), A, C) - + let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) dep(h0, _, A, B) @@ -250,255 +311,343 @@ h0 + t1 in {-1, 0, -1} propagated-dep(mapOffset(h0, t0, h1), mapOffset(h0, t0, t1), A, C) - + propagated-dep(h, t, A, B) -------------------------------------- Propagated deps count as deps dep(h, t, A, B) - Some explanation of this monstrosity is in order. - In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1. - That means that: - + Some explanation of this monstrosity is in order. In the common case, the + target offset of a dependency is the successor to the target offset: + t = h + 1. That means that: + let f(h, t, i) = i + (if i <= 0 then h else t - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else h) let f(h, h + 1, i) = i + h - This is where the "sum-like" comes from above: - We can just sum all the host offset to get the host offset of the transitive dependency. - The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; - it can be ignored as it doesn't add any new information. - - - Because of the bounds checks, the uncommon cases are h = t and h + 2 = t. - In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets. - mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package. - In the other case, h + 1 is skipped over between the host and target offsets. - Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one. - - -Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of. -The offset bounds checking and definition of mapOffset together ensure that this is the case. -Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. -From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. - + This is where the "sum-like" comes from above: We can just sum all the host + offset to get the host offset of the transitive dependency. The target + offset is the transitive dep is simply the host offset + 1, just as it was + with the dependencies composed to make this transitive one; it can be + ignored as it doesn't add any new information. + - - Variables specifying dependencies + + Because of the bounds checks, the uncommon cases are h = + t and h + 2 = t. In the former case, the + motivation for mapOffset is that since its host and + target platforms are the same, no transitive dep of it should be able to + "discover" an offset greater than its reduced target offsets. + mapOffset effectively "squashes" all its transitive + dependencies' offsets so that none will ever be greater than the target + offset of the original h = t package. In the other case, + h + 1 is skipped over between the host and target + offsets. Instead of squashing the offsets, we need to "rip" them apart so no + transitive dependencies' offset is that one. + + + Overall, the unifying theme here is that propagation shouldn't be + introducing transitive dependencies involving platforms the needing package + is unaware of. The offset bounds checking and definition of + mapOffset together ensure that this is the case. + Discovering a new offset is discovering a new platform, and since those + platforms weren't in the derivation "spec" of the needing package, they + cannot be relevant. From a capability perspective, we can imagine that the + host and target platforms of a package are the capabilities a package + requires, and the depending package must provide the capability to the + dependency. + + + + Variables specifying dependencies - depsBuildBuild - - - A list of dependencies whose host and target platforms are the new derivation's build platform. - This means a -1 host and -1 target offset from the new derivation's platforms. - They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time. - If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputsinstead. - The most common use for this buildPackages.stdenv.cc, the default C compiler for this role. - That example crops up more than one might think in old commonly used C libraries. - - - Since these packages are able to be run at build time, that are always added to the PATH, as described above. - But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. - This isn't currently enforced, but could be in the future. - - - - - - nativeBuildInputs + depsBuildBuild + - - A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. - This means a -1 host offset and 0 target offset from the new derivation's platforms. - They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation. - If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget. - This would be called depsBuildHost but for historical continuity. - - - Since these packages are able to be run at build time, that are added to the PATH, as described above. - But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. - This isn't currently enforced, but could be in the future. - - - - - - depsBuildTarget - - - A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. - This means a -1 host offset and 1 target offset from the new derivation's platforms. - They are programs used at build time that produce code to run at run with code produced by the depending package. - Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles. - In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. - Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional. - - - This is a somewhat confusing dependency to wrap ones head around, and for good reason. - As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one. - It and it's use-case go hand in hand and are both considered poor form: - try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them. - Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. - In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. + + A list of dependencies whose host and target platforms are the new + derivation's build platform. This means a -1 host and + -1 target offset from the new derivation's platforms. + They are programs/libraries used at build time that furthermore produce + programs/libraries also used at build time. If the dependency doesn't + care about the target platform (i.e. isn't a compiler or similar tool), + put it in nativeBuildInputsinstead. The most common + use for this buildPackages.stdenv.cc, the default C + compiler for this role. That example crops up more than one might think + in old commonly used C libraries. - Since these packages are able to be run at build time, that are added to the PATH, as described above. - But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. - This isn't currently enforced, but could be in the future. + Since these packages are able to be run at build time, that are always + added to the PATH, as described above. But since these + packages are only guaranteed to be able to run then, they shouldn't + persist as run-time dependencies. This isn't currently enforced, but + could be in the future. - - - - depsHostHost - - A list of dependencies whose host and target platforms match the new derivation's host platform. - This means a both 0 host offset and 0 target offset from the new derivation's host platform. - These are packages used at run-time to generate code also used at run-time. - In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself. - It's always preferable to use a depsBuildBuild dependency in the derivation being built than a depsHostHost on the tool doing the building for this purpose. - - - - - buildInputs + + + nativeBuildInputs + - - A list of dependencies whose host platform and target platform match the new derivation's. - This means a 0 host offset and 1 target offset from the new derivation's host platform. - This would be called depsHostTarget but for historical continuity. - If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild. - - - These often are programs/libraries used by the new derivation at run-time, but that isn't always the case. - For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time. - Even in the dynamic case, the library may also be needed at build time to appease the linker. - + + A list of dependencies whose host platform is the new derivation's build + platform, and target platform is the new derivation's host platform. This + means a -1 host offset and 0 target + offset from the new derivation's platforms. They are programs/libraries + used at build time that, if they are a compiler or similar tool, produce + code to run at run time—i.e. tools used to build the new derivation. If + the dependency doesn't care about the target platform (i.e. isn't a + compiler or similar tool), put it here, rather than in + depsBuildBuild or depsBuildTarget. + This would be called depsBuildHost but for historical + continuity. + + + Since these packages are able to be run at build time, that are added to + the PATH, as described above. But since these packages + only are guaranteed to be able to run then, they shouldn't persist as + run-time dependencies. This isn't currently enforced, but could be in the + future. + - - - - depsTargetTarget - - A list of dependencies whose host platform matches the new derivation's target platform. - This means a 1 offset from the new derivation's platforms. - These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. - It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. - Do not use this attribute unless you are packaging a compiler and are sure it is needed. - - - - - depsBuildBuildPropagated - - The propagated equivalent of depsBuildBuild. - This perhaps never ought to be used, but it is included for consistency [see below for the others]. - - - - - propagatedNativeBuildInputs - - The propagated equivalent of nativeBuildInputs. - This would be called depsBuildHostPropagated but for historical continuity. - For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. - If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets. - - - - - depsBuildTargetPropagated - - The propagated equivalent of depsBuildTarget. - This is prefixed for the same reason of alerting potential users. - - - - - depsHostHostPropagated - - The propagated equivalent of depsHostHost. - - - - - propagatedBuildInputs - - The propagated equivalent of buildInputs. - This would be called depsHostTargetPropagated but for historical continuity. - - - - - depsTargetTarget - - The propagated equivalent of depsTargetTarget. - This is prefixed for the same reason of alerting potential users. - - - - - -
- - -
Attributes - - - Variables affecting <literal>stdenv</literal> - initialisation - - - NIX_DEBUG - - A natural number indicating how much information to log. - If set to 1 or higher, stdenv will print moderate debug information during the build. - In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools. - If set to 6 or higher, the stdenv setup script will be run with set -x tracing. - If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing. - - - - - - - Variables affecting build properties - - - enableParallelBuilding + + + depsBuildTarget + - If set to true, stdenv will - pass specific flags to make and other build tools to - enable parallel building with up to build-cores - workers. + + A list of dependencies whose host platform is the new derivation's build + platform, and target platform is the new derivation's target platform. + This means a -1 host offset and 1 + target offset from the new derivation's platforms. They are programs used + at build time that produce code to run at run with code produced by the + depending package. Most commonly, these would tools used to build the + runtime or standard library the currently-being-built compiler will + inject into any code it compiles. In many cases, the currently-being + built compiler is itself employed for that task, but when that compiler + won't run (i.e. its build and host platform differ) this is not possible. + Other times, the compiler relies on some other tool, like binutils, that + is always built separately so the dependency is unconditional. + + + This is a somewhat confusing dependency to wrap ones head around, and for + good reason. As the only one where the platform offsets are not adjacent + integers, it requires thinking of a bootstrapping stage + two away from the current one. It and it's use-case + go hand in hand and are both considered poor form: try not to need this + sort dependency, and try not avoid building standard libraries / runtimes + in the same derivation as the compiler produces code using them. Instead + strive to build those like a normal library, using the newly-built + compiler just as a normal library would. In short, do not use this + attribute unless you are packaging a compiler and are sure it is needed. + + + Since these packages are able to be run at build time, that are added to + the PATH, as described above. But since these packages + only are guaranteed to be able to run then, they shouldn't persist as + run-time dependencies. This isn't currently enforced, but could be in the + future. + + + + + depsHostHost + + + + A list of dependencies whose host and target platforms match the new + derivation's host platform. This means a both 0 host + offset and 0 target offset from the new derivation's + host platform. These are packages used at run-time to generate code also + used at run-time. In practice, that would usually be tools used by + compilers for metaprogramming/macro systems, or libraries used by the + macros/metaprogramming code itself. It's always preferable to use a + depsBuildBuild dependency in the derivation being + built than a depsHostHost on the tool doing the + building for this purpose. + + + + + buildInputs + + + + A list of dependencies whose host platform and target platform match the + new derivation's. This means a 0 host offset and + 1 target offset from the new derivation's host + platform. This would be called depsHostTarget but for + historical continuity. If the dependency doesn't care about the target + platform (i.e. isn't a compiler or similar tool), put it here, rather + than in depsBuildBuild. + + + These often are programs/libraries used by the new derivation at + run-time, but that isn't always the case. For + example, the machine code in a statically linked library is only used at + run time, but the derivation containing the library is only needed at + build time. Even in the dynamic case, the library may also be needed at + build time to appease the linker. + + + + + depsTargetTarget + + + + A list of dependencies whose host platform matches the new derivation's + target platform. This means a 1 offset from the new + derivation's platforms. These are packages that run on the target + platform, e.g. the standard library or run-time deps of standard library + that a compiler insists on knowing about. It's poor form in almost all + cases for a package to depend on another from a future stage [future + stage corresponding to positive offset]. Do not use this attribute unless + you are packaging a compiler and are sure it is needed. + + + + + depsBuildBuildPropagated + + + + The propagated equivalent of depsBuildBuild. This + perhaps never ought to be used, but it is included for consistency [see + below for the others]. + + + + + propagatedNativeBuildInputs + + + + The propagated equivalent of nativeBuildInputs. This + would be called depsBuildHostPropagated but for + historical continuity. For example, if package Y has + propagatedNativeBuildInputs = [X], and package + Z has buildInputs = [Y], then + package Z will be built as if it included package + X in its nativeBuildInputs. If + instead, package Z has nativeBuildInputs = + [Y], then Z will be built as if it included + X in the depsBuildBuild of package + Z, because of the sum of the two -1 + host offsets. + + + + + depsBuildTargetPropagated + + + + The propagated equivalent of depsBuildTarget. This is + prefixed for the same reason of alerting potential users. + + + + + depsHostHostPropagated + + + + The propagated equivalent of depsHostHost. + + + + + propagatedBuildInputs + + + + The propagated equivalent of buildInputs. This would + be called depsHostTargetPropagated but for historical + continuity. + + + + + depsTargetTarget + + + + The propagated equivalent of depsTargetTarget. This is + prefixed for the same reason of alerting potential users. + + + + +
+
+ Attributes - Unless set to false, some build systems with good + + Variables affecting <literal>stdenv</literal> initialisation + + NIX_DEBUG + + + + A natural number indicating how much information to log. If set to 1 or + higher, stdenv will print moderate debug information + during the build. In particular, the gcc and + ld wrapper scripts will print out the complete command + line passed to the wrapped tools. If set to 6 or higher, the + stdenv setup script will be run with set + -x tracing. If set to 7 or higher, the gcc + and ld wrapper scripts will also be run with + set -x tracing. + + + + + + + Variables affecting build properties + + enableParallelBuilding + + + + If set to true, stdenv will pass + specific flags to make and other build tools to enable + parallel building with up to build-cores workers. + + + Unless set to false, some build systems with good support for parallel building including cmake, meson, and qmake will set it to - true. + true. + - - - - preferLocalBuild - If set, specifies that the package is so lightweight - in terms of build operations (e.g. write a text file from a Nix string - to the store) that there's no need to look for it in binary caches -- - it's faster to just build it locally. It also tells Hydra and other - facilities that this package doesn't need to be exported in binary - caches (noone would use it, after all). - - - - - - Special variables - - - passthru - This is an attribute set which can be filled with arbitrary - values. For example: + + + preferLocalBuild + + + + If set, specifies that the package is so lightweight in terms of build + operations (e.g. write a text file from a Nix string to the store) that + there's no need to look for it in binary caches -- it's faster to just + build it locally. It also tells Hydra and other facilities that this + package doesn't need to be exported in binary caches (noone would use it, + after all). + + + + + + Special variables + + passthru + + + + This is an attribute set which can be filled with arbitrary values. For + example: passthru = { foo = "bar"; @@ -508,895 +657,1121 @@ passthru = { }; } + + + Values inside it are not passed to the builder, so you can change them + without triggering a rebuild. However, they can be accessed outside of a + derivation directly, as if they were set inside a derivation itself, e.g. + hello.baz.value1. We don't specify any usage or schema + of passthru - it is meant for values that would be + useful outside the derivation in other parts of a Nix expression (e.g. in + other derivations). An example would be to convey some specific + dependency of your derivation which contains a program with plugins + support. Later, others who make derivations with plugins can use + passed-through dependency to ensure that their plugin would be + binary-compatible with built program. + + + + +
+
+ Phases - + + The generic builder has a number of phases. Package + builds are split into phases to make it easier to override specific parts of + the build (e.g., unpacking the sources or installing the binaries). + Furthermore, it allows a nicer presentation of build logs in the Nix build + farm. + - Values inside it are not passed to the builder, so you can change - them without triggering a rebuild. However, they can be accessed outside of a - derivation directly, as if they were set inside a derivation itself, e.g. - hello.baz.value1. We don't specify any usage or - schema of passthru - it is meant for values that would be - useful outside the derivation in other parts of a Nix expression (e.g. in other - derivations). An example would be to convey some specific dependency of your - derivation which contains a program with plugins support. Later, others who - make derivations with plugins can use passed-through dependency to ensure that - their plugin would be binary-compatible with built program. - + + Each phase can be overridden in its entirety either by setting the + environment variable namePhase + to a string containing some shell commands to be executed, or by redefining + the shell function namePhase. + The former is convenient to override a phase from the derivation, while the + latter is convenient from a build script. However, typically one only wants + to add some commands to a phase, e.g. by defining + postInstall or preFixup, as skipping + some of the default actions may have unexpected consequences. + - +
+ Controlling phases -
+ + There are a number of variables that control what phases are executed and + in what order: + + Variables affecting phase control + + phases + + + + Specifies the phases. You can change the order in which phases are + executed, or add new phases, by setting this variable. If it’s not + set, the default value is used, which is $prePhases + unpackPhase patchPhase $preConfigurePhases configurePhase + $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase + fixupPhase $preDistPhases distPhase $postPhases. + + + Usually, if you just want to add a few phases, it’s more convenient + to set one of the variables below (such as + preInstallPhases), as you then don’t specify all + the normal phases. + + + + + prePhases + + + + Additional phases executed before any of the default phases. + + + + + preConfigurePhases + + + + Additional phases executed just before the configure phase. + + + + + preBuildPhases + + + + Additional phases executed just before the build phase. + + + + + preInstallPhases + + + + Additional phases executed just before the install phase. + + + + + preFixupPhases + + + + Additional phases executed just before the fixup phase. + + + + + preDistPhases + + + + Additional phases executed just before the distribution phase. + + + + + postPhases + + + + Additional phases executed after any of the default phases. + + + + + +
+
+ The unpack phase -
Phases + + The unpack phase is responsible for unpacking the source code of the + package. The default implementation of unpackPhase + unpacks the source files listed in the src environment + variable to the current directory. It supports the following files by + default: + + + Tar files + + + These can optionally be compressed using gzip + (.tar.gz, .tgz or + .tar.Z), bzip2 + (.tar.bz2 or .tbz2) or + xz (.tar.xz or + .tar.lzma). + + + + + Zip files + + + Zip files are unpacked using unzip. However, + unzip is not in the standard environment, so you + should add it to buildInputs yourself. + + + + + Directories in the Nix store + + + These are simply copied to the current directory. The hash part of the + file name is stripped, e.g. + /nix/store/1wydxgby13cz...-my-sources would be + copied to my-sources. + + + + + Additional file types can be supported by setting the + unpackCmd variable (see below). + -The generic builder has a number of phases. -Package builds are split into phases to make it easier to override -specific parts of the build (e.g., unpacking the sources or installing -the binaries). Furthermore, it allows a nicer presentation of build -logs in the Nix build farm. + -Each phase can be overridden in its entirety either by setting -the environment variable -namePhase to a string -containing some shell commands to be executed, or by redefining the -shell function -namePhase. The former -is convenient to override a phase from the derivation, while the -latter is convenient from a build script. - -However, typically one only wants to add some -commands to a phase, e.g. by defining postInstall -or preFixup, as skipping some of the default actions -may have unexpected consequences. - - - -
Controlling -phases - -There are a number of variables that control what phases are -executed and in what order: - - - Variables affecting phase control - - - phases - - Specifies the phases. You can change the order in which - phases are executed, or add new phases, by setting this - variable. If it’s not set, the default value is used, which is - $prePhases unpackPhase patchPhase $preConfigurePhases - configurePhase $preBuildPhases buildPhase checkPhase - $preInstallPhases installPhase fixupPhase $preDistPhases - distPhase $postPhases. + + Variables controlling the unpack phase + + srcs / src + + + + The list of source files or directories to be unpacked or copied. One of + these must be set. - - Usually, if you just want to add a few phases, it’s more - convenient to set one of the variables below (such as - preInstallPhases), as you then don’t specify - all the normal phases. - - - - - prePhases - - Additional phases executed before any of the default phases. - - - - - preConfigurePhases - - Additional phases executed just before the configure phase. - - - - - preBuildPhases - - Additional phases executed just before the build phase. - - - - - preInstallPhases - - Additional phases executed just before the install phase. - - - - - preFixupPhases - - Additional phases executed just before the fixup phase. - - - - - preDistPhases - - Additional phases executed just before the distribution phase. - - - - - postPhases - - Additional phases executed after any of the default - phases. - - - - - - - -
- - -
The unpack phase - -The unpack phase is responsible for unpacking the source code of -the package. The default implementation of -unpackPhase unpacks the source files listed in -the src environment variable to the current directory. -It supports the following files by default: - - - - - Tar files - These can optionally be compressed using - gzip (.tar.gz, - .tgz or .tar.Z), - bzip2 (.tar.bz2 or - .tbz2) or xz - (.tar.xz or - .tar.lzma). - - - - Zip files - Zip files are unpacked using - unzip. However, unzip is - not in the standard environment, so you should add it to - buildInputs yourself. - - - - Directories in the Nix store - These are simply copied to the current directory. - The hash part of the file name is stripped, - e.g. /nix/store/1wydxgby13cz...-my-sources - would be copied to - my-sources. - - - - -Additional file types can be supported by setting the -unpackCmd variable (see below). - - - - - Variables controlling the unpack phase - - - srcs / src - The list of source files or directories to be - unpacked or copied. One of these must be set. - - - - sourceRoot - After running unpackPhase, - the generic builder changes the current directory to the directory - created by unpacking the sources. If there are multiple source - directories, you should set sourceRoot to the - name of the intended directory. - - - - setSourceRoot - Alternatively to setting - sourceRoot, you can set - setSourceRoot to a shell command to be - evaluated by the unpack phase after the sources have been - unpacked. This command must set - sourceRoot. - - - - preUnpack - Hook executed at the start of the unpack - phase. - - - - postUnpack - Hook executed at the end of the unpack - phase. - - - - dontMakeSourcesWritable - If set to 1, the unpacked - sources are not made - writable. By default, they are made writable to prevent problems - with read-only sources. For example, copied store directories - would be read-only without this. - - - - unpackCmd - The unpack phase evaluates the string - $unpackCmd for any unrecognised file. The path - to the current source file is contained in the - curSrc variable. - - - - -
- - -
The patch phase - -The patch phase applies the list of patches defined in the -patches variable. - - - Variables controlling the patch phase - - - patches - The list of patches. They must be in the format - accepted by the patch command, and may - optionally be compressed using gzip - (.gz), bzip2 - (.bz2) or xz - (.xz). - - - - patchFlags - Flags to be passed to patch. - If not set, the argument is used, which - causes the leading directory component to be stripped from the - file names in each patch. - - - - prePatch - Hook executed at the start of the patch - phase. - - - - postPatch - Hook executed at the end of the patch - phase. - - - - -
- - -
The configure phase - -The configure phase prepares the source tree for building. The -default configurePhase runs -./configure (typically an Autoconf-generated -script) if it exists. - - - Variables controlling the configure phase - - - configureScript - The name of the configure script. It defaults to - ./configure if it exists; otherwise, the - configure phase is skipped. This can actually be a command (like - perl ./Configure.pl). - - - - configureFlags - A list of strings passed as additional arguments to the - configure script. - - - - configureFlagsArray - A shell array containing additional arguments - passed to the configure script. You must use this instead of - configureFlags if the arguments contain - spaces. - - - - dontAddPrefix - By default, the flag - --prefix=$prefix is added to the configure - flags. If this is undesirable, set this variable to - true. - - - - prefix - The prefix under which the package must be - installed, passed via the option to the - configure script. It defaults to - . - - - - dontAddDisableDepTrack - By default, the flag - --disable-dependency-tracking is added to the - configure flags to speed up Automake-based builds. If this is - undesirable, set this variable to true. - - - - dontFixLibtool - By default, the configure phase applies some - special hackery to all files called ltmain.sh - before running the configure script in order to improve the purity - of Libtool-based packagesIt clears the - sys_lib_*search_path - variables in the Libtool script to prevent Libtool from using - libraries in /usr/lib and - such.. If this is undesirable, set this - variable to true. - - - - dontDisableStatic - By default, when the configure script has - , the option - is added to the configure flags. - If this is undesirable, set this variable to - true. - - - - configurePlatforms - - By default, when cross compiling, the configure script has and passed. - Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. - Compilers and other tools should use this to also pass the target platform, for example. - Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. - - - - - preConfigure - Hook executed at the start of the configure - phase. - - - - postConfigure - Hook executed at the end of the configure - phase. - - - - - -
- - -
The build phase - -The build phase is responsible for actually building the package -(e.g. compiling it). The default buildPhase -simply calls make if a file named -Makefile, makefile or -GNUmakefile exists in the current directory (or -the makefile is explicitly set); otherwise it does -nothing. - - - Variables controlling the build phase - - - dontBuild - Set to true to skip the build phase. - - - - makefile - The file name of the Makefile. - - - - makeFlags - A list of strings passed as additional flags to - make. These flags are also used by the default - install and check phase. For setting make flags specific to the - build phase, use buildFlags (see below). - + + + + sourceRoot + + + + After running unpackPhase, the generic builder + changes the current directory to the directory created by unpacking the + sources. If there are multiple source directories, you should set + sourceRoot to the name of the intended directory. + + + + + setSourceRoot + + + + Alternatively to setting sourceRoot, you can set + setSourceRoot to a shell command to be evaluated by + the unpack phase after the sources have been unpacked. This command must + set sourceRoot. + + + + + preUnpack + + + + Hook executed at the start of the unpack phase. + + + + + postUnpack + + + + Hook executed at the end of the unpack phase. + + + + + dontMakeSourcesWritable + + + + If set to 1, the unpacked sources are + not made writable. By default, they are made + writable to prevent problems with read-only sources. For example, copied + store directories would be read-only without this. + + + + + unpackCmd + + + + The unpack phase evaluates the string $unpackCmd for + any unrecognised file. The path to the current source file is contained + in the curSrc variable. + + + + +
+ +
+ The patch phase + + + The patch phase applies the list of patches defined in the + patches variable. + + + + Variables controlling the patch phase + + patches + + + + The list of patches. They must be in the format accepted by the + patch command, and may optionally be compressed using + gzip (.gz), + bzip2 (.bz2) or + xz (.xz). + + + + + patchFlags + + + + Flags to be passed to patch. If not set, the argument + is used, which causes the leading directory + component to be stripped from the file names in each patch. + + + + + prePatch + + + + Hook executed at the start of the patch phase. + + + + + postPatch + + + + Hook executed at the end of the patch phase. + + + + +
+ +
+ The configure phase + + + The configure phase prepares the source tree for building. The default + configurePhase runs ./configure + (typically an Autoconf-generated script) if it exists. + + + + Variables controlling the configure phase + + configureScript + + + + The name of the configure script. It defaults to + ./configure if it exists; otherwise, the configure + phase is skipped. This can actually be a command (like perl + ./Configure.pl). + + + + + configureFlags + + + + A list of strings passed as additional arguments to the configure + script. + + + + + configureFlagsArray + + + + A shell array containing additional arguments passed to the configure + script. You must use this instead of configureFlags + if the arguments contain spaces. + + + + + dontAddPrefix + + + + By default, the flag --prefix=$prefix is added to the + configure flags. If this is undesirable, set this variable to true. + + + + + prefix + + + + The prefix under which the package must be installed, passed via the + option to the configure script. It defaults to + . + + + + + dontAddDisableDepTrack + + + + By default, the flag --disable-dependency-tracking is + added to the configure flags to speed up Automake-based builds. If this + is undesirable, set this variable to true. + + + + + dontFixLibtool + + + + By default, the configure phase applies some special hackery to all + files called ltmain.sh before running the configure + script in order to improve the purity of Libtool-based packages + + + It clears the + sys_lib_*search_path + variables in the Libtool script to prevent Libtool from using + libraries in /usr/lib and such. + + + . If this is undesirable, set this variable to true. + + + + + dontDisableStatic + + + + By default, when the configure script has + , the option + is added to the configure flags. + + + If this is undesirable, set this variable to true. + + + + + configurePlatforms + + + + By default, when cross compiling, the configure script has + and passed. + Packages can instead pass [ "build" "host" "target" ] + or a subset to control exactly which platform flags are passed. + Compilers and other tools should use this to also pass the target + platform, for example. + + + Eventually these will be passed when in native builds too, to improve + determinism: build-time guessing, as is done today, is a risk of + impurity. + + + + + + + preConfigure + + + + Hook executed at the start of the configure phase. + + + + + postConfigure + + + + Hook executed at the end of the configure phase. + + + + +
+ +
+ The build phase + + + The build phase is responsible for actually building the package (e.g. + compiling it). The default buildPhase simply calls + make if a file named Makefile, + makefile or GNUmakefile exists in + the current directory (or the makefile is explicitly + set); otherwise it does nothing. + + + + Variables controlling the build phase + + dontBuild + + + + Set to true to skip the build phase. + + + + + makefile + + + + The file name of the Makefile. + + + + + checkInputs + + + A list of dependencies used by the phase. This gets included in + buildInputs when doCheck is set. + + + + makeFlags + + + + A list of strings passed as additional flags to make. + These flags are also used by the default install and check phase. For + setting make flags specific to the build phase, use + buildFlags (see below). makeFlags = [ "PREFIX=$(out)" ]; - - The flags are quoted in bash, but environment variables can - be specified by using the make syntax. - - - - makeFlagsArray - A shell array containing additional arguments - passed to make. You must use this instead of - makeFlags if the arguments contain - spaces, e.g. - + + + The flags are quoted in bash, but environment variables can be + specified by using the make syntax. + + + + + + + makeFlagsArray + + + + A shell array containing additional arguments passed to + make. You must use this instead of + makeFlags if the arguments contain spaces, e.g. makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") + Note that shell arrays cannot be passed through environment variables, + so you cannot set makeFlagsArray in a derivation + attribute (because those are passed through environment variables): you + have to define them in shell code. + + + + + buildFlags / buildFlagsArray + + + + A list of strings passed as additional flags to make. + Like makeFlags and makeFlagsArray, + but only used by the build phase. + + + + + preBuild + + + + Hook executed at the start of the build phase. + + + + + postBuild + + + + Hook executed at the end of the build phase. + + + + - Note that shell arrays cannot be passed through environment - variables, so you cannot set makeFlagsArray in - a derivation attribute (because those are passed through - environment variables): you have to define them in shell - code. - + + You can set flags for make through the + makeFlags variable. + - - buildFlags / buildFlagsArray - A list of strings passed as additional flags to - make. Like makeFlags and - makeFlagsArray, but only used by the build - phase. - + + Before and after running make, the hooks + preBuild and postBuild are called, + respectively. + +
- - preBuild - Hook executed at the start of the build - phase. - +
+ The check phase - - postBuild - Hook executed at the end of the build - phase. - + + The check phase checks whether the package was built correctly by running + its test suite. The default checkPhase calls + make check, but only if the doCheck + variable is enabled. + - - - - -You can set flags for make through the -makeFlags variable. - -Before and after running make, the hooks -preBuild and postBuild are -called, respectively. - -
- - -
The check phase - -The check phase checks whether the package was built correctly -by running its test suite. The default -checkPhase calls make check, -but only if the doCheck variable is enabled. - - - Variables controlling the check phase - - - doCheck - - Controls whether the check phase is executed. - By default it is skipped, but if doCheck is set to true, the check phase is usually executed. - Thus you should set doCheck = true; in the derivation to enable checks. - The exception is cross compilation. - Cross compiled builds never run tests, no matter how doCheck is set, - as the newly-built program won't run on the platform used to build it. - - - - - checkInputs - - A list of dependencies used by the phase. This gets included in buildInputs when doCheck is set. - - - - - makeFlags / + + Variables controlling the check phase + + doCheck + + + + Controls whether the check phase is executed. By default it is skipped, + but if doCheck is set to true, the check phase is + usually executed. Thus you should set +doCheck = true; + in the derivation to enable checks. The exception is cross compilation. + Cross compiled builds never run tests, no matter how + doCheck is set, as the newly-built program won't run + on the platform used to build it. + + + + + makeFlags / makeFlagsArray / - makefile - See the build phase for details. - + makefile + + + + See the build phase for details. + + + + + checkTarget + + + + The make target that runs the tests. Defaults to + check. + + + + + checkFlags / checkFlagsArray + + + + A list of strings passed as additional flags to make. + Like makeFlags and makeFlagsArray, + but only used by the check phase. + + + + + preCheck + + + + Hook executed at the start of the check phase. + + + + + postCheck + + + + Hook executed at the end of the check phase. + + + + +
- - checkTarget - The make target that runs the tests. Defaults to - check. - +
+ The install phase - - checkFlags / checkFlagsArray - A list of strings passed as additional flags to - make. Like makeFlags and - makeFlagsArray, but only used by the check - phase. - + + The install phase is responsible for installing the package in the Nix + store under out. The default + installPhase creates the directory + $out and calls make install. + - - preCheck - Hook executed at the start of the check - phase. - - - - postCheck - Hook executed at the end of the check - phase. - - - - - -
- - -
The install phase - -The install phase is responsible for installing the package in -the Nix store under out. The default -installPhase creates the directory -$out and calls make -install. - - - Variables controlling the install phase - - - makeFlags / + + Variables controlling the install phase + + makeFlags / makeFlagsArray / - makefile - See the build phase for details. - - - - installTargets - The make targets that perform the installation. - Defaults to install. Example: - + makefile + + + + See the build phase for details. + + + + + installTargets + + + + The make targets that perform the installation. Defaults to + install. Example: installTargets = "install-bin install-doc"; + + + + + installFlags / installFlagsArray + + + + A list of strings passed as additional flags to make. + Like makeFlags and makeFlagsArray, + but only used by the install phase. + + + + + preInstall + + + + Hook executed at the start of the install phase. + + + + + postInstall + + + + Hook executed at the end of the install phase. + + + + +
- - +
+ The fixup phase - - installFlags / installFlagsArray - A list of strings passed as additional flags to - make. Like makeFlags and - makeFlagsArray, but only used by the install - phase. - - - - preInstall - Hook executed at the start of the install - phase. - - - - postInstall - Hook executed at the end of the install - phase. - - - - - -
- - -
The fixup phase - -The fixup phase performs some (Nix-specific) post-processing -actions on the files installed under $out by the -install phase. The default fixupPhase does the -following: - - - - It moves the man/, - doc/ and info/ - subdirectories of $out to - share/. - - It strips libraries and executables of debug - information. - - On Linux, it applies the patchelf - command to ELF executables and libraries to remove unused - directories from the RPATH in order to prevent - unnecessary runtime dependencies. - - It rewrites the interpreter paths of shell scripts - to paths found in PATH. E.g., - /usr/bin/perl will be rewritten to - /nix/store/some-perl/bin/perl - found in PATH. - - - - - - - Variables controlling the fixup phase - - - dontStrip - If set, libraries and executables are not - stripped. By default, they are. - - - dontStripHost - - Like dontStripHost, but only affects the strip command targetting the package's host platform. - Useful when supporting cross compilation, but otherwise feel free to ignore. - - - - dontStripTarget - - Like dontStripHost, but only affects the strip command targetting the packages' target platform. - Useful when supporting cross compilation, but otherwise feel free to ignore. - - - - - dontMoveSbin - If set, files in $out/sbin are not moved - to $out/bin. By default, they are. - - - - stripAllList - List of directories to search for libraries and - executables from which all symbols should be - stripped. By default, it’s empty. Stripping all symbols is - risky, since it may remove not just debug symbols but also ELF - information necessary for normal execution. - - - - stripAllFlags - Flags passed to the strip - command applied to the files in the directories listed in - stripAllList. Defaults to - (i.e. ). - - - - stripDebugList - List of directories to search for libraries and - executables from which only debugging-related symbols should be - stripped. It defaults to lib bin - sbin. - - - - stripDebugFlags - Flags passed to the strip - command applied to the files in the directories listed in - stripDebugList. Defaults to - - (i.e. ). - - - - dontPatchELF - If set, the patchelf command is - not used to remove unnecessary RPATH entries. - Only applies to Linux. - - - - dontPatchShebangs - If set, scripts starting with - #! do not have their interpreter paths - rewritten to paths in the Nix store. - - - - forceShare - The list of directories that must be moved from - $out to $out/share. - Defaults to man doc info. - - - - setupHook - A package can export a setup hook by setting this - variable. The setup hook, if defined, is copied to - $out/nix-support/setup-hook. Environment - variables are then substituted in it using substituteAll. - - - - preFixup - Hook executed at the start of the fixup - phase. - - - - postFixup - Hook executed at the end of the fixup - phase. - - - - separateDebugInfo - If set to true, the standard - environment will enable debug information in C/C++ builds. After - installation, the debug information will be separated from the - executables and stored in the output named - debug. (This output is enabled automatically; - you don’t need to set the outputs attribute - explicitly.) To be precise, the debug information is stored in - debug/lib/debug/.build-id/XX/YYYY…, - where XXYYYY… is the build - ID of the binary — a SHA-1 hash of the contents of - the binary. Debuggers like GDB use the build ID to look up the - separated debug information. - - For example, with GDB, you can add + + The fixup phase performs some (Nix-specific) post-processing actions on the + files installed under $out by the install phase. The + default fixupPhase does the following: + + + + It moves the man/, doc/ and + info/ subdirectories of $out to + share/. + + + + + It strips libraries and executables of debug information. + + + + + On Linux, it applies the patchelf command to ELF + executables and libraries to remove unused directories from the + RPATH in order to prevent unnecessary runtime + dependencies. + + + + + It rewrites the interpreter paths of shell scripts to paths found in + PATH. E.g., /usr/bin/perl will be + rewritten to + /nix/store/some-perl/bin/perl + found in PATH. + + + + + + Variables controlling the fixup phase + + dontStrip + + + + If set, libraries and executables are not stripped. By default, they + are. + + + + + dontStripHost + + + + Like dontStripHost, but only affects the + strip command targetting the package's host platform. + Useful when supporting cross compilation, but otherwise feel free to + ignore. + + + + + dontStripTarget + + + + Like dontStripHost, but only affects the + strip command targetting the packages' target + platform. Useful when supporting cross compilation, but otherwise feel + free to ignore. + + + + + dontMoveSbin + + + + If set, files in $out/sbin are not moved to + $out/bin. By default, they are. + + + + + stripAllList + + + + List of directories to search for libraries and executables from which + all symbols should be stripped. By default, it’s + empty. Stripping all symbols is risky, since it may remove not just + debug symbols but also ELF information necessary for normal execution. + + + + + stripAllFlags + + + + Flags passed to the strip command applied to the + files in the directories listed in stripAllList. + Defaults to (i.e. ). + + + + + stripDebugList + + + + List of directories to search for libraries and executables from which + only debugging-related symbols should be stripped. It defaults to + lib bin sbin. + + + + + stripDebugFlags + + + + Flags passed to the strip command applied to the + files in the directories listed in stripDebugList. + Defaults to (i.e. ). + + + + + dontPatchELF + + + + If set, the patchelf command is not used to remove + unnecessary RPATH entries. Only applies to Linux. + + + + + dontPatchShebangs + + + + If set, scripts starting with #! do not have their + interpreter paths rewritten to paths in the Nix store. + + + + + forceShare + + + + The list of directories that must be moved from + $out to $out/share. Defaults + to man doc info. + + + + + setupHook + + + + A package can export a setup + hook by setting this variable. The setup hook, if defined, is + copied to $out/nix-support/setup-hook. Environment + variables are then substituted in it using + substituteAll. + + + + + preFixup + + + + Hook executed at the start of the fixup phase. + + + + + postFixup + + + + Hook executed at the end of the fixup phase. + + + + + separateDebugInfo + + + + If set to true, the standard environment will enable + debug information in C/C++ builds. After installation, the debug + information will be separated from the executables and stored in the + output named debug. (This output is enabled + automatically; you don’t need to set the outputs + attribute explicitly.) To be precise, the debug information is stored in + debug/lib/debug/.build-id/XX/YYYY…, + where XXYYYY… is the build + ID of the binary — a SHA-1 hash of the contents of the + binary. Debuggers like GDB use the build ID to look up the separated + debug information. + + + For example, with GDB, you can add set debug-file-directory ~/.nix-profile/lib/debug + to ~/.gdbinit. GDB will then be able to find debug + information installed via nix-env -i. + + + + +
- to ~/.gdbinit. GDB will then be able to find - debug information installed via nix-env - -i. +
+ The installCheck phase - - + + The installCheck phase checks whether the package was installed correctly + by running its test suite against the installed directories. The default + installCheck calls make + installcheck. + - + + Variables controlling the installCheck phase + + doInstallCheck + + + + Controls whether the installCheck phase is executed. By default it is + skipped, but if doInstallCheck is set to true, the + installCheck phase is usually executed. Thus you should set +doInstallCheck = true; + in the derivation to enable install checks. The exception is cross + compilation. Cross compiled builds never run tests, no matter how + doInstallCheck is set, as the newly-built program + won't run on the platform used to build it. + + + + + installCheckInputs + + + A list of dependencies used by the phase. This gets included in + buildInputs when doInstallCheck + is set. + + + + preInstallCheck + + + + Hook executed at the start of the installCheck phase. + + + + + postInstallCheck + + + + Hook executed at the end of the installCheck phase. + + + + +
-
+
+ The distribution phase -
The installCheck phase + + The distribution phase is intended to produce a source distribution of the + package. The default distPhase first calls + make dist, then it copies the resulting source tarballs + to $out/tarballs/. This phase is only executed if the + attribute doDist is set. + -The installCheck phase checks whether the package was installed -correctly by running its test suite against the installed directories. -The default installCheck calls make -installcheck. + + Variables controlling the distribution phase + + distTarget + + + + The make target that produces the distribution. Defaults to + dist. + + + + + distFlags / distFlagsArray + + + + Additional flags passed to make. + + + + + tarballs + + + + The names of the source distribution files to be copied to + $out/tarballs/. It can contain shell wildcards. The + default is *.tar.gz. + + + + + dontCopyDist + + + + If set, no files are copied to $out/tarballs/. + + + + + preDist + + + + Hook executed at the start of the distribution phase. + + + + + postDist + + + + Hook executed at the end of the distribution phase. + + + + +
+
+
+ Shell functions - - Variables controlling the installCheck phase - - - doInstallCheck - - Controls whether the installCheck phase is executed. - By default it is skipped, but if doInstallCheck is set to true, the installCheck phase is usually executed. - Thus you should set doInstallCheck = true; in the derivation to enable install checks. - The exception is cross compilation. - Cross compiled builds never run tests, no matter how doInstallCheck is set, - as the newly-built program won't run on the platform used to build it. - - - - - installCheckInputs - - A list of dependencies used by the phase. This gets included in buildInputs when doInstallCheck is set. - - - - - preInstallCheck - Hook executed at the start of the installCheck - phase. - - - - postInstallCheck - Hook executed at the end of the installCheck - phase. - - - - -
- -
The distribution -phase - -The distribution phase is intended to produce a source -distribution of the package. The default -distPhase first calls make -dist, then it copies the resulting source tarballs to -$out/tarballs/. This phase is only executed if -the attribute doDist is set. - - - Variables controlling the distribution phase - - - distTarget - The make target that produces the distribution. - Defaults to dist. - - - - distFlags / distFlagsArray - Additional flags passed to - make. - - - - tarballs - The names of the source distribution files to be - copied to $out/tarballs/. It can contain - shell wildcards. The default is - *.tar.gz. - - - - dontCopyDist - If set, no files are copied to - $out/tarballs/. - - - - preDist - Hook executed at the start of the distribution - phase. - - - - postDist - Hook executed at the end of the distribution - phase. - - - - - -
- - -
- - -
Shell functions - -The standard environment provides a number of useful -functions. - - - - - - makeWrapper - executable - wrapperfile - args - Constructs a wrapper for a program with various - possible arguments. For example: + + The standard environment provides a number of useful functions. + + + + makeWrapperexecutablewrapperfileargs + + + + Constructs a wrapper for a program with various possible arguments. For + example: # adds `FOOBAR=baz` to `$out/bin/foo`’s environment makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz @@ -1406,662 +1781,763 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz # (via string replacements or in `configurePhase`). makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]} - - There’s many more kinds of arguments, they are documented in - nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh. - - wrapProgram is a convenience function you probably - want to use most of the time. - + There’s many more kinds of arguments, they are documented in + nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh. + + + wrapProgram is a convenience function you probably + want to use most of the time. + - - - - - substitute - infile - outfile - subs - + + + substituteinfileoutfilesubs + - Performs string substitution on the contents of + + Performs string substitution on the contents of infile, writing the result to - outfile. The substitutions in + outfile. The substitutions in subs are of the following form: - - - - - s1 - s2 - Replace every occurrence of the string - s1 by - s2. - - - - - varName - Replace every occurrence of - @varName@ by - the contents of the environment variable - varName. This is useful for - generating files from templates, using - @...@ in the - template as placeholders. - - - - - varName - s - Replace every occurrence of - @varName@ by - the string s. - - - - - - - Example: - + + + s1s2 + + + + Replace every occurrence of the string s1 + by s2. + + + + + varName + + + + Replace every occurrence of + @varName@ by the + contents of the environment variable + varName. This is useful for generating + files from templates, using + @...@ in the template + as placeholders. + + + + + varNames + + + + Replace every occurrence of + @varName@ by the string + s. + + + + + + + Example: substitute ./foo.in ./foo.out \ --replace /usr/bin/bar $bar/bin/bar \ --replace "a string containing spaces" "some other text" \ --subst-var someVar - - - - substitute is implemented using the + + + substitute is implemented using the replace - command. Unlike with the sed command, you - don’t have to worry about escaping special characters. It - supports performing substitutions on binary files (such as - executables), though there you’ll probably want to make sure - that the replacement string is as long as the replaced - string. - + command. Unlike with the sed command, you don’t have + to worry about escaping special characters. It supports performing + substitutions on binary files (such as executables), though there + you’ll probably want to make sure that the replacement string is as + long as the replaced string. + - - - - - substituteInPlace - file - subs - Like substitute, but performs - the substitutions in place on the file - file. - - - - - substituteAll - infile - outfile - Replaces every occurrence of - @varName@, where - varName is any environment variable, in - infile, writing the result to - outfile. For instance, if - infile has the contents - + + + substituteInPlacefilesubs + + + + Like substitute, but performs the substitutions in + place on the file file. + + + + + substituteAllinfileoutfile + + + + Replaces every occurrence of + @varName@, where + varName is any environment variable, in + infile, writing the result to + outfile. For instance, if + infile has the contents #! @bash@/bin/sh PATH=@coreutils@/bin echo @foo@ - - and the environment contains - bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39 - and - coreutils=/nix/store/68afga4khv0w...-coreutils-6.12, - but does not contain the variable foo, then the - output will be - + and the environment contains + bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39 and + coreutils=/nix/store/68afga4khv0w...-coreutils-6.12, + but does not contain the variable foo, then the output + will be #! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin echo @foo@ - - That is, no substitution is performed for undefined variables. - - Environment variables that start with an uppercase letter or an - underscore are filtered out, - to prevent global variables (like HOME) or private - variables (like __ETC_PROFILE_DONE) from accidentally - getting substituted. - The variables also have to be valid bash “names”, as - defined in the bash manpage (alphanumeric or _, - must not start with a number). - - - - - - substituteAllInPlace - file - Like substituteAll, but performs - the substitutions in place on the file - file. - - - - - stripHash - path - Strips the directory and hash part of a store - path, outputting the name part to stdout. - For example: - + That is, no substitution is performed for undefined variables. + + + Environment variables that start with an uppercase letter or an + underscore are filtered out, to prevent global variables (like + HOME) or private variables (like + __ETC_PROFILE_DONE) from accidentally getting + substituted. The variables also have to be valid bash “names”, as + defined in the bash manpage (alphanumeric or _, must + not start with a number). + + + + + substituteAllInPlacefile + + + + Like substituteAll, but performs the substitutions + in place on the file file. + + + + + stripHashpath + + + + Strips the directory and hash part of a store path, outputting the name + part to stdout. For example: # prints coreutils-8.24 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" - - If you wish to store the result in another variable, then the - following idiom may be useful: - + If you wish to store the result in another variable, then the following + idiom may be useful: name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" someVar=$(stripHash $name) - - - - - - - wrapProgram - executable - makeWrapperArgs - Convenience function for makeWrapper - that automatically creates a sane wrapper file - - It takes all the same arguments as makeWrapper, - except for --argv0. - - It cannot be applied multiple times, since it will overwrite the wrapper - file. + - + + + wrapProgramexecutablemakeWrapperArgs + + + + Convenience function for makeWrapper that + automatically creates a sane wrapper file It takes all the same arguments + as makeWrapper, except for --argv0. + + + It cannot be applied multiple times, since it will overwrite the wrapper + file. + + + + +
+
+ Package setup hooks + + Nix itself considers a build-time dependency merely something that should + previously be built and accessible at build time—packages themselves are + on their own to perform any additional setup. In most cases, that is fine, + and the downstream derivation can deal with it's own dependencies. But for a + few common tasks, that would result in almost every package doing the same + sort of setup work---depending not on the package itself, but entirely on + which dependencies were used. + - + + In order to alleviate this burden, the setup + hook>mechanism was written, where any package can include a + shell script that [by convention rather than enforcement by Nix], any + downstream reverse-dependency will source as part of its build process. That + allows the downstream dependency to merely specify its dependencies, and + lets those dependencies effectively initialize themselves. No boilerplate + mirroring the list of dependencies is needed. + -
+ + The Setup hook mechanism is a bit of a sledgehammer though: a powerful + feature with a broad and indiscriminate area of effect. The combination of + its power and implicit use may be expedient, but isn't without costs. Nix + itself is unchanged, but the spirit of adding dependencies being effect-free + is violated even if the letter isn't. For example, if a derivation path is + mentioned more than once, Nix itself doesn't care and simply makes sure the + dependency derivation is already built just the same—depending is just + needing something to exist, and needing is idempotent. However, a dependency + specified twice will have its setup hook run twice, and that could easily + change the build environment (though a well-written setup hook will + therefore strive to be idempotent so this is in fact not observable). More + broadly, setup hooks are anti-modular in that multiple dependencies, whether + the same or different, should not interfere and yet their setup hooks may + well do so. + + + The most typical use of the setup hook is actually to add other hooks which + are then run (i.e. after all the setup hooks) on each dependency. For + example, the C compiler wrapper's setup hook feeds itself flags for each + dependency that contains relevant libaries and headers. This is done by + defining a bash function, and appending its name to one of + envBuildBuildHooks`, envBuildHostHooks`, + envBuildTargetHooks`, envHostHostHooks`, + envHostTargetHooks`, or envTargetTargetHooks`. + These 6 bash variables correspond to the 6 sorts of dependencies by platform + (there's 12 total but we ignore the propagated/non-propagated axis). + -
Package setup hooks - - - Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. - In most cases, that is fine, and the downstream derivation can deal with it's own dependencies. - But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used. - - - In order to alleviate this burden, the setup hook>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. - That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. - No boilerplate mirroring the list of dependencies is needed. - - - The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. - The combination of its power and implicit use may be expedient, but isn't without costs. - Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't. - For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. - However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). - More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. - - - The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. - For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers. - This is done by defining a bash function, and appending its name to one of - envBuildBuildHooks`, - envBuildHostHooks`, - envBuildTargetHooks`, - envHostHostHooks`, - envHostTargetHooks`, or - envTargetTargetHooks`. - These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). - - - Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included. - Returning to the C compiler wrapper example, if it itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform. - The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before it's setup hook is sourced. - Additionally, since most environment hooks don't care about the target platform, - That means the setup hook can append to the right bash array by doing something like - + + Packages adding a hook should not hard code a specific hook, but rather + choose a variable relative to how they are included. + Returning to the C compiler wrapper example, if it itself is an + n dependency, then it only wants to accumulate flags from + n + 1 dependencies, as only those ones match the + compiler's target platform. The hostOffset variable is + defined with the current dependency's host offset + targetOffset with its target offset, before it's setup hook + is sourced. Additionally, since most environment hooks don't care about the + target platform, That means the setup hook can append to the right bash + array by doing something like + addEnvHooks "$hostOffset" myBashFunction - - - The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism. - Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. - Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time. - - - Here are some packages that provide a setup hook. - Since the mechanism is modular, this probably isn't an exhaustive list. - Then again, since the mechanism is only to be used as a last resort, it might be. - + - - Bintools Wrapper - + + The existence of setups hooks has long been documented + and packages inside Nixpkgs are free to use these mechanism. Other packages, + however, should not rely on these mechanisms not changing between Nixpkgs + versions. Because of the existing issues with this system, there's little + benefit from mandating it be stable for any period of time. + + + + Here are some packages that provide a setup hook. Since the mechanism is + modular, this probably isn't an exhaustive list. Then again, since the + mechanism is only to be used as a last resort, it might be. + + + Bintools Wrapper + - Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. - These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin. - [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.] - Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Bintools Wrapper. - Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper. + Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous + purposes. These are GNU Binutils when targetting Linux, and a mix of + cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to + be a compromise between "Binutils" and "cctools" not denoting any + specific implementation.] Specifically, the underlying bintools package, + and a C standard library (glibc or Darwin's libSystem, just for the + dynamic loader) are all fed in, and dependency finding, hardening (see + below), and purity checks for each are handled by Bintools Wrapper. + Packages typically depend on CC Wrapper, which in turn (at run time) + depends on Bintools Wrapper. - Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. - For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). - Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. - It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables. - Bintools Wrapper's setup hook causes any lib and lib64 subdirectories to be added to NIX_LDFLAGS. - Since CC Wrapper and Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to CC Wrapper. - But CC Wrapper's code, by contrast, has quite lengthy comments. - Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. + Bintools Wrapper was only just recently split off from CC Wrapper, so + the division of labor is still being worked out. For example, it + shouldn't care about about the C standard library, but just take a + derivation with the dynamic loader (which happens to be the glibc on + linux). Dependency finding however is a task both wrappers will continue + to need to share, and probably the most important to understand. It is + currently accomplished by collecting directories of host-platform + dependencies (i.e. buildInputs and + nativeBuildInputs) in environment variables. Bintools + Wrapper's setup hook causes any lib and + lib64 subdirectories to be added to + NIX_LDFLAGS. Since CC Wrapper and Bintools Wrapper use + the same strategy, most of the Bintools Wrapper code is sparsely + commented and refers to CC Wrapper. But CC Wrapper's code, by contrast, + has quite lengthy comments. Bintools Wrapper merely cites those, rather + than repeating them, to avoid falling out of sync. - A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose. - They are defined to just be the base name of the tools, under the assumption that Bintools Wrapper's binaries will be on the path. - Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used. - Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use. - - Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times. - As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms. - - BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them. + A final task of the setup hook is defining a number of standard + environment variables to tell build systems which executables full-fill + which purpose. They are defined to just be the base name of the tools, + under the assumption that Bintools Wrapper's binaries will be on the + path. Firstly, this helps poorly-written packages, e.g. ones that look + for just gcc when CC isn't defined yet + clang is to be used. Secondly, this helps packages + not get confused when cross-compiling, in which case multiple Bintools + Wrappers may simultaneously be in use. + + + Each wrapper targets a single platform, so if binaries for multiple + platforms are needed, the underlying binaries must be wrapped multiple + times. As this is a property of the wrapper itself, the multiple + wrappings are needed whether or not the same underlying binaries can + target multiple platforms. + + + BUILD_- and TARGET_-prefixed versions of + the normal environment variable are defined for the additional Bintools + Wrappers, properly disambiguating them. - A problem with this final task is that Bintools Wrapper is honest and defines LD as ld. - Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback. - This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use. - The workaround is to define, just for the problematic package, LD as the C compiler. - A good way to do this would be preConfigure = "LD=$CC". + A problem with this final task is that Bintools Wrapper is honest and + defines LD as ld. Most packages, + however, firstly use the C compiler for linking, secondly use + LD anyways, defining it as the C compiler, and thirdly, + only so define LD when it is undefined as a fallback. + This triple-threat means Bintools Wrapper will break those packages, as + LD is already defined as the actual linker which the package won't + override yet doesn't want to use. The workaround is to define, just for + the problematic package, LD as the C compiler. A good way + to do this would be preConfigure = "LD=$CC". - - - - - CC Wrapper - + + + + CC Wrapper + - CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. - Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper. - Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper. + CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. + Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C + standard library (glibc or Darwin's libSystem, just for the dynamic + loader) are all fed in, and dependency finding, hardening (see below), + and purity checks for each are handled by CC Wrapper. Packages typically + depend on CC Wrapper, which in turn (at run time) depends on Bintools + Wrapper. - Dependency finding is undoubtedly the main task of CC Wrapper. - This works just like Bintools Wrapper, except that any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE. - The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. + Dependency finding is undoubtedly the main task of CC Wrapper. This + works just like Bintools Wrapper, except that any + include subdirectory of any relevant dependency is + added to NIX_CFLAGS_COMPILE. The setup hook itself + contains some lengthy comments describing the exact convoluted mechanism + by which this is accomplished. - CC Wrapper also like Bintools Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above. - Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang). - This helps lousy build systems that inspect on the name of the compiler rather than run it. + CC Wrapper also like Bintools Wrapper defines standard environment + variables with the names of the tools it wraps, for the same reasons + described above. Importantly, while it includes a cc + symlink to the c compiler for portability, the CC will be + defined using the compiler's "real name" (i.e. gcc or + clang). This helps lousy build systems that inspect + on the name of the compiler rather than run it. - - - - - Perl - + + + + Perl + - Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. - For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. + Adds the lib/site_perl subdirectory of each build + input to the PERL5LIB environment variable. For instance, + if buildInputs contains Perl, then the + lib/site_perl subdirectory of each input is added + to the PERL5LIB environment variable. - - - - - Python - Adds the - lib/${python.libPrefix}/site-packages subdirectory of - each build input to the PYTHONPATH environment - variable. - - - - pkg-config - Adds the lib/pkgconfig and - share/pkgconfig subdirectories of each - build input to the PKG_CONFIG_PATH environment - variable. - - - - Automake - Adds the share/aclocal - subdirectory of each build input to the ACLOCAL_PATH - environment variable. - - - - Autoconf - The autoreconfHook derivation adds - autoreconfPhase, which runs autoreconf, libtoolize and - automake, essentially preparing the configure script in autotools-based - builds. - - - - libxml2 - Adds every file named - catalog.xml found under the - xml/dtd and xml/xsl - subdirectories of each build input to the - XML_CATALOG_FILES environment - variable. - - - - teTeX / TeX Live - Adds the share/texmf-nix - subdirectory of each build input to the TEXINPUTS - environment variable. - - - - Qt 4 - Sets the QTDIR environment variable - to Qt’s path. - - - - gdk-pixbuf - Exports GDK_PIXBUF_MODULE_FILE - environment variable the the builder. Add librsvg package - to buildInputs to get svg support. - - - - GHC - Creates a temporary package database and registers - every Haskell build input in it (TODO: how?). - - - - GStreamer - Adds the - GStreamer plugins subdirectory of - each build input to the GST_PLUGIN_SYSTEM_PATH_1_0 or - GST_PLUGIN_SYSTEM_PATH environment variable. - - - - paxctl - Defines the paxmark helper for - setting per-executable PaX flags on Linux (where it is available by - default; on all other platforms, paxmark is a no-op). - For example, to disable secure memory protections on the executable - foo: - + + + + Python + + + Adds the lib/${python.libPrefix}/site-packages + subdirectory of each build input to the PYTHONPATH + environment variable. + + + + + pkg-config + + + Adds the lib/pkgconfig and + share/pkgconfig subdirectories of each build input + to the PKG_CONFIG_PATH environment variable. + + + + + Automake + + + Adds the share/aclocal subdirectory of each build + input to the ACLOCAL_PATH environment variable. + + + + + Autoconf + + + The autoreconfHook derivation adds + autoreconfPhase, which runs autoreconf, libtoolize + and automake, essentially preparing the configure script in + autotools-based builds. + + + + + libxml2 + + + Adds every file named catalog.xml found under the + xml/dtd and xml/xsl + subdirectories of each build input to the + XML_CATALOG_FILES environment variable. + + + + + teTeX / TeX Live + + + Adds the share/texmf-nix subdirectory of each build + input to the TEXINPUTS environment variable. + + + + + Qt 4 + + + Sets the QTDIR environment variable to Qt’s path. + + + + + gdk-pixbuf + + + Exports GDK_PIXBUF_MODULE_FILE environment variable the + the builder. Add librsvg package to buildInputs to + get svg support. + + + + + GHC + + + Creates a temporary package database and registers every Haskell build + input in it (TODO: how?). + + + + + GStreamer + + + Adds the GStreamer plugins subdirectory of each build input to the + GST_PLUGIN_SYSTEM_PATH_1_0 or + GST_PLUGIN_SYSTEM_PATH environment variable. + + + + + paxctl + + + Defines the paxmark helper for setting per-executable + PaX flags on Linux (where it is available by default; on all other + platforms, paxmark is a no-op). For example, to + disable secure memory protections on the executable + foo: + postFixup = '' paxmark m $out/bin/foo ''; - The m flag is the most common flag and is typically - required for applications that employ JIT compilation or otherwise need to - execute code generated at run-time. Disabling PaX protections should be - considered a last resort: if possible, problematic features should be - disabled or patched to work with PaX. - + The m flag is the most common flag and is typically + required for applications that employ JIT compilation or otherwise need + to execute code generated at run-time. Disabling PaX protections should + be considered a last resort: if possible, problematic features should be + disabled or patched to work with PaX. + + + + + autoPatchelfHook + + + This is a special setup hook which helps in packaging proprietary + software in that it automatically tries to find missing shared library + dependencies of ELF files. All packages within the + runtimeDependencies environment variable are + unconditionally added to executables, which is useful for programs that + use + dlopen + 3 to load libraries at runtime. + + + + + +
+
+ Purity in Nixpkgs - - autoPatchelfHook - This is a special setup hook which helps in packaging - proprietary software in that it automatically tries to find missing shared - library dependencies of ELF files. All packages within the - runtimeDependencies environment variable are unconditionally - added to executables, which is useful for programs that use - - dlopen - 3 - - to load libraries at runtime. - + + [measures taken to prevent dependencies on packages outside the store, and + what you can do to prevent them] + - + + GCC doesn't search in locations such as /usr/include. + In fact, attempts to add such directories through the + flag are filtered out. Likewise, the linker (from GNU binutils) doesn't + search in standard locations such as /usr/lib. Programs + built on Linux are linked against a GNU C Library that likewise doesn't + search in the default system locations. + +
+
+ Hardening in Nixpkgs - + + There are flags available to harden packages at compile or link-time. These + can be toggled using the stdenv.mkDerivation parameters + hardeningDisable and hardeningEnable. + -
+ + Both parameters take a list of flags as strings. The special + "all" flag can be passed to + hardeningDisable to turn off all hardening. These flags + can also be used as environment variables for testing or development + purposes. + + + The following flags are enabled by default and might require disabling with + hardeningDisable if the program to package is + incompatible. + -
Purity in Nixpkgs - -[measures taken to prevent dependencies on packages outside the -store, and what you can do to prevent them] - -GCC doesn't search in locations such as -/usr/include. In fact, attempts to add such -directories through the flag are filtered out. -Likewise, the linker (from GNU binutils) doesn't search in standard -locations such as /usr/lib. Programs built on -Linux are linked against a GNU C Library that likewise doesn't search -in the default system locations. - -
- -
Hardening in Nixpkgs - -There are flags available to harden packages at compile or link-time. -These can be toggled using the stdenv.mkDerivation parameters -hardeningDisable and hardeningEnable. - - - -Both parameters take a list of flags as strings. The special -"all" flag can be passed to hardeningDisable -to turn off all hardening. These flags can also be used as environment variables -for testing or development purposes. - - -The following flags are enabled by default and might require disabling with -hardeningDisable if the program to package is incompatible. - - - - - - format - Adds the compiler options. At present, - this warns about calls to printf and - scanf functions where the format string is - not a string literal and there are no format arguments, as in - printf(foo);. This may be a security hole - if the format string came from untrusted input and contains - %n. - - This needs to be turned off or fixed for errors similar to: - - + + + format + + + + Adds the compiler options. At present, this warns + about calls to printf and scanf + functions where the format string is not a string literal and there are + no format arguments, as in printf(foo);. This may be a + security hole if the format string came from untrusted input and contains + %n. + + + This needs to be turned off or fixed for errors similar to: + + /tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security] printf(help_message); ^ cc1plus: some warnings being treated as errors - - - - - stackprotector + + + + + stackprotector + - Adds the - compiler options. This adds safety checks against stack overwrites - rendering many potential code injection attacks into aborting situations. - In the best case this turns code injection vulnerabilities into denial - of service or into non-issues (depending on the application). - - This needs to be turned off or fixed for errors similar to: - - + + Adds the compiler options. This adds safety checks + against stack overwrites rendering many potential code injection attacks + into aborting situations. In the best case this turns code injection + vulnerabilities into denial of service or into non-issues (depending on + the application). + + + This needs to be turned off or fixed for errors similar to: + + bin/blib.a(bios_console.o): In function `bios_handle_cup': /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' - - - - - fortify + + + + + fortify + - Adds the compiler - options. During code generation the compiler knows a great deal of - information about buffer sizes (where possible), and attempts to replace - insecure unlimited length buffer function calls with length-limited ones. - This is especially useful for old, crufty code. Additionally, format - strings in writable memory that contain '%n' are blocked. If an application - depends on such a format string, it will need to be worked around. - - - Additionally, some warnings are enabled which might trigger build - failures if compiler warnings are treated as errors in the package build. - In this case, set to - . - - This needs to be turned off or fixed for errors similar to: - - + + Adds the compiler options. + During code generation the compiler knows a great deal of information + about buffer sizes (where possible), and attempts to replace insecure + unlimited length buffer function calls with length-limited ones. This is + especially useful for old, crufty code. Additionally, format strings in + writable memory that contain '%n' are blocked. If an application depends + on such a format string, it will need to be worked around. + + + Additionally, some warnings are enabled which might trigger build + failures if compiler warnings are treated as errors in the package build. + In this case, set to + . + + + This needs to be turned off or fixed for errors similar to: + + malloc.c:404:15: error: return type is an incomplete type malloc.c:410:19: error: storage size of 'ms' isn't known - + strdup.h:22:1: error: expected identifier or '(' before '__extension__' - + strsep.c:65:23: error: register name not specified for 'delim' - + installwatch.c:3751:5: error: conflicting types for '__open_2' - + fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments - - - - pic + + + pic + - Adds the compiler options. This options adds - support for position independent code in shared libraries and thus making - ASLR possible. - Most notably, the Linux kernel, kernel modules and other code - not running in an operating system environment like boot loaders won't - build with PIC enabled. The compiler will is most cases complain that - PIC is not supported for a specific build. - - - This needs to be turned off or fixed for assembler errors similar to: - - + + Adds the compiler options. This options adds + support for position independent code in shared libraries and thus making + ASLR possible. + + + Most notably, the Linux kernel, kernel modules and other code not running + in an operating system environment like boot loaders won't build with PIC + enabled. The compiler will is most cases complain that PIC is not + supported for a specific build. + + + This needs to be turned off or fixed for assembler errors similar to: + + ccbLfRgg.s: Assembler messages: ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' - - - - strictoverflow + + + strictoverflow + - Signed integer overflow is undefined behaviour according to the C - standard. If it happens, it is an error in the program as it should check - for overflow before it can happen, not afterwards. GCC provides built-in - functions to perform arithmetic with overflow checking, which are correct - and faster than any custom implementation. As a workaround, the option - makes gcc behave as if signed - integer overflows were defined. - - - This flag should not trigger any build or runtime errors. + + Signed integer overflow is undefined behaviour according to the C + standard. If it happens, it is an error in the program as it should check + for overflow before it can happen, not afterwards. GCC provides built-in + functions to perform arithmetic with overflow checking, which are correct + and faster than any custom implementation. As a workaround, the option + makes gcc behave as if signed + integer overflows were defined. + + + This flag should not trigger any build or runtime errors. + - - - - relro + + + relro + - Adds the linker option. During program - load, several ELF memory sections need to be written to by the linker, - but can be turned read-only before turning over control to the program. - This prevents some GOT (and .dtors) overwrite attacks, but at least the - part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. - - - This flag can break dynamic shared object loading. For instance, the - module systems of Xorg and OpenCV are incompatible with this flag. In almost - all cases the bindnow flag must also be disabled and - incompatible programs typically fail with similar errors at runtime. + + Adds the linker option. During program load, + several ELF memory sections need to be written to by the linker, but can + be turned read-only before turning over control to the program. This + prevents some GOT (and .dtors) overwrite attacks, but at least the part + of the GOT used by the dynamic linker (.got.plt) is still vulnerable. + + + This flag can break dynamic shared object loading. For instance, the + module systems of Xorg and OpenCV are incompatible with this flag. In + almost all cases the bindnow flag must also be + disabled and incompatible programs typically fail with similar errors at + runtime. + - - - - bindnow + + + bindnow + - Adds the linker option. During program - load, all dynamic symbols are resolved, allowing for the complete GOT to - be marked read-only (due to relro). This prevents GOT - overwrite attacks. For very large applications, this can incur some - performance loss during initial load while symbols are resolved, but this - shouldn't be an issue for daemons. - - - This flag can break dynamic shared object loading. For instance, the - module systems of Xorg and PHP are incompatible with this flag. Programs - incompatible with this flag often fail at runtime due to missing symbols, - like: - - + + Adds the linker option. During program load, + all dynamic symbols are resolved, allowing for the complete GOT to be + marked read-only (due to relro). This prevents GOT + overwrite attacks. For very large applications, this can incur some + performance loss during initial load while symbols are resolved, but this + shouldn't be an issue for daemons. + + + This flag can break dynamic shared object loading. For instance, the + module systems of Xorg and PHP are incompatible with this flag. Programs + incompatible with this flag often fail at runtime due to missing symbols, + like: + + intel_drv.so: undefined symbol: vgaHWFreeHWRec - + + - + + The following flags are disabled by default and should be enabled with + hardeningEnable for packages that take untrusted input + like network services. + -The following flags are disabled by default and should be enabled -with hardeningEnable for packages that take untrusted -input like network services. - - - - - - pie + + + pie + - Adds the compiler and - linker options. Position Independent Executables are needed to take - advantage of Address Space Layout Randomization, supported by modern - kernel versions. While ASLR can already be enforced for data areas in - the stack and heap (brk and mmap), the code areas must be compiled as - position-independent. Shared libraries already do this with the - pic flag, so they gain ASLR automatically, but binary - .text regions need to be build with pie to gain ASLR. - When this happens, ROP attacks are much harder since there are no static - locations to bounce off of during a memory corruption attack. - + + Adds the compiler and linker + options. Position Independent Executables are needed to take advantage of + Address Space Layout Randomization, supported by modern kernel versions. + While ASLR can already be enforced for data areas in the stack and heap + (brk and mmap), the code areas must be compiled as position-independent. + Shared libraries already do this with the pic flag, so + they gain ASLR automatically, but binary .text regions need to be build + with pie to gain ASLR. When this happens, ROP attacks + are much harder since there are no static locations to bounce off of + during a memory corruption attack. + - - - - -For more in-depth information on these hardening flags and hardening in -general, refer to the -Debian Wiki, -Ubuntu Wiki, -Gentoo Wiki, -and the -Arch Wiki. - - -
+ + + + For more in-depth information on these hardening flags and hardening in + general, refer to the + Debian Wiki, + Ubuntu + Wiki, + Gentoo + Wiki, and the + + Arch Wiki. + +
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index d3cf221c9b69..ffa3a90b5eb6 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -1,447 +1,513 @@ + Submitting changes +
+ Making patches -Submitting changes - -
-Making patches - - - -Read Manual (How to write packages for Nix). - - - -Fork the repository on GitHub. - - - -Create a branch for your future fix. - - - -You can make branch from a commit of your local nixos-version. That will help you to avoid additional local compilations. Because you will receive packages from binary cache. - - - -For example: nixos-version returns 15.05.git.0998212 (Dingo). So you can do: - - - + + + + Read Manual (How to + write packages for Nix). + + + + + Fork the repository on GitHub. + + + + + Create a branch for your future fix. + + + + You can make branch from a commit of your local + nixos-version. That will help you to avoid + additional local compilations. Because you will receive packages from + binary cache. + + + + For example: nixos-version returns + 15.05.git.0998212 (Dingo). So you can do: + + + $ git checkout 0998212 $ git checkout -b 'fix/pkg-name-update' - - - - -Please avoid working directly on the master branch. - - - - - - -Make commits of logical units. - - - -If you removed pkgs, made some major NixOS changes etc., write about them in nixos/doc/manual/release-notes/rl-unstable.xml. - - - - - - -Check for unnecessary whitespace with git diff --check before committing. - - - -Format the commit in a following way: + + + + + Please avoid working directly on the master branch. + + + + + + + + Make commits of logical units. + + + + If you removed pkgs, made some major NixOS changes etc., write about + them in + nixos/doc/manual/release-notes/rl-unstable.xml. + + + + + + + + Check for unnecessary whitespace with git diff --check + before committing. + + + + + Format the commit in a following way: + (pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc) Additional information. + + + + Examples: + + + + nginx: init at 2.0.1 + + + + + firefox: 54.0.1 -> 55.0 + + + + + nixos/hydra: add bazBaz option + + + + + nixos/nginx: refactor config generation + + + + + + + + + + Test your changes. If you work with + + + + nixpkgs: + + + + update pkg -> + + + + nix-env -i pkg-name -f <path to your local nixpkgs + folder> + + + + + + + + add pkg -> + + + + Make sure it's in + pkgs/top-level/all-packages.nix + + + + + nix-env -i pkg-name -f <path to your local nixpkgs + folder> + + + + + + + + If you don't want to install pkg in you + profile. + + + + nix-build -A pkg-attribute-name <path to your local + nixpkgs folder>/default.nix and check results in the + folder result. It will appear in the same + directory where you did nix-build. + + + + + + + + If you did nix-env -i pkg-name you can do + nix-env -e pkg-name to uninstall it from your + system. + + + + + + + + NixOS and its modules: + + + + You can add new module to your NixOS configuration file (usually + it's /etc/nixos/configuration.nix). And do + sudo nixos-rebuild test -I nixpkgs=<path to your local + nixpkgs folder> --fast. + + + + + + + + + + + If you have commits pkg-name: oh, forgot to insert + whitespace: squash commits in this case. Use git rebase + -i. + + + + + Rebase you branch against current master. + + + +
+
+ Submitting changes - - -Examples: - - - - -nginx: init at 2.0.1 - - - - - -firefox: 54.0.1 -> 55.0 - - - - - -nixos/hydra: add bazBaz option - - - - - -nixos/nginx: refactor config generation - - - - - - - - - -Test your changes. If you work with - - - -nixpkgs: - - - -update pkg -> - - - - -nix-env -i pkg-name -f <path to your local nixpkgs folder> - - - - - - - -add pkg -> - - - -Make sure it's in pkgs/top-level/all-packages.nix - - - - - -nix-env -i pkg-name -f <path to your local nixpkgs folder> - - - - - - - - -If you don't want to install pkg in you profile. - - - - -nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix and check results in the folder result. It will appear in the same directory where you did nix-build. - - - - - - -If you did nix-env -i pkg-name you can do nix-env -e pkg-name to uninstall it from your system. - - - - - - -NixOS and its modules: - - - -You can add new module to your NixOS configuration file (usually it's /etc/nixos/configuration.nix). - And do sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast. - - - - - - - - - -If you have commits pkg-name: oh, forgot to insert whitespace: squash commits in this case. Use git rebase -i. - - - -Rebase you branch against current master. - - -
- -
-Submitting changes - - - -Push your changes to your fork of nixpkgs. - - - -Create pull request: - - - -Write the title in format (pkg-name | nixos/<module>): improvement. - - - -If you update the pkg, write versions from -> to. - - - - - - -Write in comment if you have tested your patch. Do not rely much on TravisCI. - - - -If you make an improvement, write about your motivation. - - - -Notify maintainers of the package. For example add to the message: cc @jagajaga @domenkozar. - - - - - -
- -
+ + + + Push your changes to your fork of nixpkgs. + + + + + Create pull request: + + + + Write the title in format (pkg-name | nixos/<module>): + improvement. + + + + If you update the pkg, write versions from -> to. + + + + + + + + Write in comment if you have tested your patch. Do not rely much on + TravisCI. + + + + + If you make an improvement, write about your motivation. + + + + + Notify maintainers of the package. For example add to the message: + cc @jagajaga @domenkozar. + + + + + + +
+
Pull Request Template + - The pull request template helps determine what steps have been made for a - contribution so far, and will help guide maintainers on the status of a - change. The motivation section of the PR should include any extra details - the title does not address and link any existing issues related to the pull - request. + The pull request template helps determine what steps have been made for a + contribution so far, and will help guide maintainers on the status of a + change. The motivation section of the PR should include any extra details + the title does not address and link any existing issues related to the pull + request. - When a PR is created, it will be pre-populated with some checkboxes detailed below: + + + When a PR is created, it will be pre-populated with some checkboxes detailed + below: +
- Tested using sandboxing - - When sandbox builds are enabled, Nix will setup an isolated environment - for each build process. It is used to remove further hidden dependencies - set by the build environment to improve reproducibility. This includes - access to the network during the build outside of - fetch* functions and files outside the Nix store. - Depending on the operating system access to other resources are blocked - as well (ex. inter process communication is isolated on Linux); see Tested using sandboxing + + + When sandbox builds are enabled, Nix will setup an isolated environment for + each build process. It is used to remove further hidden dependencies set by + the build environment to improve reproducibility. This includes access to + the network during the build outside of fetch* + functions and files outside the Nix store. Depending on the operating + system access to other resources are blocked as well (ex. inter process + communication is isolated on Linux); see + build-use-sandbox - in Nix manual for details. - - - Sandboxing is not enabled by default in Nix due to a small performance - hit on each build. In pull requests for nixpkgs people - are asked to test builds with sandboxing enabled (see Tested - using sandboxing in the pull request template) because - in + + + Sandboxing is not enabled by default in Nix due to a small performance hit + on each build. In pull requests for + nixpkgs + people are asked to test builds with sandboxing enabled (see + Tested using sandboxing in the pull request template) + because + inhttps://nixos.org/hydra/ - sandboxing is also used. - - - Depending if you use NixOS or other platforms you can use one of the - following methods to enable sandboxing before building the package: - - - - Globally enable sandboxing on NixOS: - add the following to - configuration.nix - nix.useSandbox = true; - - - - - Globally enable sandboxing on non-NixOS platforms: - add the following to: /etc/nix/nix.conf - build-use-sandbox = true - - - - - + sandboxing is also used. + + + + Depending if you use NixOS or other platforms you can use one of the + following methods to enable sandboxing + before building the package: + + + + Globally enable sandboxing on NixOS: + add the following to configuration.nix +nix.useSandbox = true; + + + + + Globally enable sandboxing on non-NixOS + platforms: add the following to: + /etc/nix/nix.conf +build-use-sandbox = true + + + +
+
- Built on platform(s) - - Many Nix packages are designed to run on multiple - platforms. As such, it's important to let the maintainer know which - platforms your changes have been tested on. It's not always practical to - test a change on all platforms, and is not required for a pull request to - be merged. Only check the systems you tested the build on in this - section. - + Built on platform(s) + + + Many Nix packages are designed to run on multiple platforms. As such, it's + important to let the maintainer know which platforms your changes have been + tested on. It's not always practical to test a change on all platforms, and + is not required for a pull request to be merged. Only check the systems you + tested the build on in this section. +
+
- Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) - - Packages with automated tests are much more likely to be merged in a - timely fashion because it doesn't require as much manual testing by the - maintainer to verify the functionality of the package. If there are - existing tests for the package, they should be run to verify your changes - do not break the tests. Tests only apply to packages with NixOS modules - defined and can only be run on Linux. For more details on writing and - running tests, see the Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) + + + Packages with automated tests are much more likely to be merged in a timely + fashion because it doesn't require as much manual testing by the maintainer + to verify the functionality of the package. If there are existing tests for + the package, they should be run to verify your changes do not break the + tests. Tests only apply to packages with NixOS modules defined and can only + be run on Linux. For more details on writing and running tests, see the + section - in the NixOS manual. - + in the NixOS manual. +
+
- Tested compilation of all pkgs that depend on this change using <command>nox-review</command> - - If you are updating a package's version, you can use nox to make sure all - packages that depend on the updated package still compile correctly. This - can be done using the nox utility. The nox-review - utility can look for and build all dependencies either based on - uncommited changes with the wip option or specifying a - github pull request number. - - - review uncommitted changes: - nix-shell -p nox --run "nox-review wip" - - - review changes from pull request number 12345: - nix-shell -p nox --run "nox-review pr 12345" - + Tested compilation of all pkgs that depend on this change using <command>nox-review</command> + + + If you are updating a package's version, you can use nox to make sure all + packages that depend on the updated package still compile correctly. This + can be done using the nox utility. The nox-review + utility can look for and build all dependencies either based on uncommited + changes with the wip option or specifying a github pull + request number. + + + + review uncommitted changes: +nix-shell -p nox --run "nox-review wip" + + + + review changes from pull request number 12345: +nix-shell -p nox --run "nox-review pr 12345" +
+
- Tested execution of all binary files (usually in <filename>./result/bin/</filename>) - - It's important to test any executables generated by a build when you - change or create a package in nixpkgs. This can be done by looking in - ./result/bin and running any files in there, or at a - minimum, the main executable for the package. For example, if you make a change - to texlive, you probably would only check the binaries - associated with the change you made rather than testing all of them. - + Tested execution of all binary files (usually in <filename>./result/bin/</filename>) + + + It's important to test any executables generated by a build when you change + or create a package in nixpkgs. This can be done by looking in + ./result/bin and running any files in there, or at a + minimum, the main executable for the package. For example, if you make a + change to texlive, you probably would only check the + binaries associated with the change you made rather than testing all of + them. +
+
- Meets nixpkgs contribution standards - - The last checkbox is fits Meets nixpkgs contribution standards + + + The last checkbox is fits + CONTRIBUTING.md. - The contributing document has detailed information on standards the Nix - community has for commit messages, reviews, licensing of contributions - you make to the project, etc... Everyone should read and understand the - standards the community has for contributing before submitting a pull - request. - - + The contributing document has detailed information on standards the Nix + community has for commit messages, reviews, licensing of contributions you + make to the project, etc... Everyone should read and understand the + standards the community has for contributing before submitting a pull + request. +
-
- -
-Hotfixing pull requests - - - -Make the appropriate changes in you branch. - - - -Don't create additional commits, do - - - -git rebase -i - - - -git push --force to your branch. - - - - - - -
- -
-Commit policy - - - -Commits must be sufficiently tested before being merged, both for the master and staging branches. - - - -Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested. - - - -When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra. - - - -
- Master branch +
+
+ Hotfixing pull requests - - - It should only see non-breaking commits that do not cause mass rebuilds. - - + + + Make the appropriate changes in you branch. + + + + + Don't create additional commits, do + + + + git rebase -i + + + + + git push --force to your branch. + + + + + -
- -
- Staging branch +
+
+ Commit policy - - - It's only for non-breaking mass-rebuild commits. That means it's not to - be used for testing, and changes must have been well tested already. - Read policy here. - - - - - If the branch is already in a broken state, please refrain from adding - extra new breakages. Stabilize it for a few days, merge into master, - then resume development on staging. - Keep an eye on the staging evaluations here. - If any fixes for staging happen to be already in master, then master can - be merged into staging. - - + + + Commits must be sufficiently tested before being merged, both for the + master and staging branches. + + + + + Hydra builds for master and staging should not be used as testing + platform, it's a build farm for changes that have been already tested. + + + + + When changing the bootloader installation process, extra care must be + taken. Grub installations cannot be rolled back, hence changes may break + people's installations forever. For any non-trivial change to the + bootloader please file a PR asking for review, especially from @edolstra. + + -
-
- Stable release branches +
+ Master branch - + - - If you're cherry-picking a commit to a stable release branch, always use - git cherry-pick -xe and ensure the message contains a - clear description about why this needs to be included in the stable - branch. - - An example of a cherry-picked commit would look like this: - + + It should only see non-breaking commits that do not cause mass rebuilds. + + + +
+ +
+ Staging branch + + + + + It's only for non-breaking mass-rebuild commits. That means it's not to + be used for testing, and changes must have been well tested already. + Read + policy here. + + + + + If the branch is already in a broken state, please refrain from adding + extra new breakages. Stabilize it for a few days, merge into master, then + resume development on staging. + Keep + an eye on the staging evaluations here. If any fixes for staging + happen to be already in master, then master can be merged into staging. + + + +
+ +
+ Stable release branches + + + + + If you're cherry-picking a commit to a stable release branch, always use + git cherry-pick -xe and ensure the message contains a + clear description about why this needs to be included in the stable + branch. + + + An example of a cherry-picked commit would look like this: + + nixos: Refactor the world. The original commit message describing the reason why the world was torn apart. @@ -451,9 +517,7 @@ Reason: I just had a gut feeling that this would also be wanted by people from the stone age. - -
- -
+ +
+
- diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index e229cccb365c..fdb120ebb5cb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -96,7 +96,7 @@ rec { }; iphone32 = { - config = "armv7-apple-ios"; + config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; sdkVer = "10.2"; useiOSPrebuilt = true; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14fd53b2f492..4b584e6a1151 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3984,6 +3984,11 @@ github = "vyp"; name = "vyp"; }; + wchresta = { + email = "wchresta.nix@chrummibei.ch"; + github = "wchresta"; + name = "wchresta"; + }; wedens = { email = "kirill.wedens@gmail.com"; name = "wedens"; diff --git a/nixos/doc/manual/.gitignore b/nixos/doc/manual/.gitignore new file mode 100644 index 000000000000..879282624217 --- /dev/null +++ b/nixos/doc/manual/.gitignore @@ -0,0 +1,2 @@ +generated +manual-combined.xml diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile index b15fbaa270fc..2e2322d5fb51 100644 --- a/nixos/doc/manual/Makefile +++ b/nixos/doc/manual/Makefile @@ -1,6 +1,22 @@ -debug: +.PHONY: all +all: manual-combined.xml format + +.PHONY: debug +debug: generated manual-combined.xml + +manual-combined.xml: generated *.xml + rm -f ./manual-combined.xml nix-shell --packages xmloscopy \ - --run 'xmloscopy --docbook5 ./manual.xml ./manual-combined.xml' + --run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml" + +.PHONY: format +format: + find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ + xmlformat --config-file "../xmlformat.conf" -i {} + +.PHONY: clean +clean: + rm -f manual-combined.xml generated generated: ./options-to-docbook.xsl nix-build ../../release.nix \ diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index be6ff3aac0fe..5f05ad261ef3 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -3,63 +3,83 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-boot-problems"> + Boot Problems -Boot Problems + + If NixOS fails to boot, there are a number of kernel command line parameters + that may help you to identify or fix the issue. You can add these parameters + in the GRUB boot menu by pressing “e” to modify the selected boot entry + and editing the line starting with linux. The following + are some useful kernel command line parameters that are recognised by the + NixOS boot scripts or by systemd: + + + boot.shell_on_fail + + + + Start a root shell if something goes wrong in stage 1 of the boot process + (the initial ramdisk). This is disabled by default because there is no + authentication for the root shell. + + + + + boot.debug1 + + + + Start an interactive shell in stage 1 before anything useful has been + done. That is, no modules have been loaded and no file systems have been + mounted, except for /proc and + /sys. + + + + + boot.trace + + + + Print every shell command executed by the stage 1 and 2 boot scripts. + + + + + single + + + + Boot into rescue mode (a.k.a. single user mode). This will cause systemd + to start nothing but the unit rescue.target, which + runs sulogin to prompt for the root password and start + a root login shell. Exiting the shell causes the system to continue with + the normal boot process. + + + + + systemd.log_level=debug systemd.log_target=console + + + + Make systemd very verbose and send log messages to the console instead of + the journal. + + + + + For more parameters recognised by systemd, see + systemd + 1. + -If NixOS fails to boot, there are a number of kernel command -line parameters that may help you to identify or fix the issue. You -can add these parameters in the GRUB boot menu by pressing “e” to -modify the selected boot entry and editing the line starting with -linux. The following are some useful kernel command -line parameters that are recognised by the NixOS boot scripts or by -systemd: - - - - boot.shell_on_fail - Start a root shell if something goes wrong in - stage 1 of the boot process (the initial ramdisk). This is - disabled by default because there is no authentication for the - root shell. - - - boot.debug1 - Start an interactive shell in stage 1 before - anything useful has been done. That is, no modules have been - loaded and no file systems have been mounted, except for - /proc and - /sys. - - - boot.trace - Print every shell command executed by the stage 1 - and 2 boot scripts. - - - single - Boot into rescue mode (a.k.a. single user mode). - This will cause systemd to start nothing but the unit - rescue.target, which runs - sulogin to prompt for the root password and - start a root login shell. Exiting the shell causes the system to - continue with the normal boot process. - - - systemd.log_level=debug systemd.log_target=console - Make systemd very verbose and send log messages to - the console instead of the journal. - - - - -For more parameters recognised by systemd, see -systemd1. - -If no login prompts or X11 login screens appear (e.g. due to -hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, -this will start rescue mode (described above). (Also note that since -most units have a 90-second timeout before systemd gives up on them, -the agetty login prompts should appear eventually -unless something is very wrong.) - -
\ No newline at end of file + + If no login prompts or X11 login screens appear (e.g. due to hanging + dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start + rescue mode (described above). (Also note that since most units have a + 90-second timeout before systemd gives up on them, the + agetty login prompts should appear eventually unless + something is very wrong.) + +
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index 52512b8f1270..ee201982a40b 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -3,60 +3,51 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-gc"> - -Cleaning the Nix Store - -Nix has a purely functional model, meaning that packages are -never upgraded in place. Instead new versions of packages end up in a -different location in the Nix store (/nix/store). -You should periodically run Nix’s garbage -collector to remove old, unreferenced packages. This is -easy: - + Cleaning the Nix Store + + Nix has a purely functional model, meaning that packages are never upgraded + in place. Instead new versions of packages end up in a different location in + the Nix store (/nix/store). You should periodically run + Nix’s garbage collector to remove old, unreferenced + packages. This is easy: $ nix-collect-garbage - -Alternatively, you can use a systemd unit that does the same in the -background: - + Alternatively, you can use a systemd unit that does the same in the + background: # systemctl start nix-gc.service - -You can tell NixOS in configuration.nix to run -this unit automatically at certain points in time, for instance, every -night at 03:15: - + You can tell NixOS in configuration.nix to run this unit + automatically at certain points in time, for instance, every night at 03:15: = true; = "03:15"; - - - -The commands above do not remove garbage collector roots, such -as old system configurations. Thus they do not remove the ability to -roll back to previous configurations. The following command deletes -old roots, removing the ability to roll back to them: + + + The commands above do not remove garbage collector roots, such as old system + configurations. Thus they do not remove the ability to roll back to previous + configurations. The following command deletes old roots, removing the ability + to roll back to them: $ nix-collect-garbage -d -You can also do this for specific profiles, e.g. + You can also do this for specific profiles, e.g. $ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old -Note that NixOS system configurations are stored in the profile -/nix/var/nix/profiles/system. - -Another way to reclaim disk space (often as much as 40% of the -size of the Nix store) is to run Nix’s store optimiser, which seeks -out identical files in the store and replaces them with hard links to -a single copy. + Note that NixOS system configurations are stored in the profile + /nix/var/nix/profiles/system. + + + Another way to reclaim disk space (often as much as 40% of the size of the + Nix store) is to run Nix’s store optimiser, which seeks out identical files + in the store and replaces them with hard links to a single copy. $ nix-store --optimise -Since this command needs to read the entire Nix store, it can take -quite a while to finish. - + Since this command needs to read the entire Nix store, it can take quite a + while to finish. + diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 2fc353059dfc..4b977d1d82eb 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -3,15 +3,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-container-networking"> + Container Networking - -Container Networking - -When you create a container using nixos-container -create, it gets it own private IPv4 address in the range -10.233.0.0/16. You can get the container’s IPv4 -address as follows: - + + When you create a container using nixos-container create, + it gets it own private IPv4 address in the range + 10.233.0.0/16. You can get the container’s IPv4 address + as follows: # nixos-container show-ip foo 10.233.4.2 @@ -19,40 +17,39 @@ address as follows: $ ping -c1 10.233.4.2 64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms + - - -Networking is implemented using a pair of virtual Ethernet -devices. The network interface in the container is called -eth0, while the matching interface in the host is -called ve-container-name -(e.g., ve-foo). The container has its own network -namespace and the CAP_NET_ADMIN capability, so it -can perform arbitrary network configuration such as setting up -firewall rules, without affecting or having access to the host’s -network. - -By default, containers cannot talk to the outside network. If -you want that, you should set up Network Address Translation (NAT) -rules on the host to rewrite container traffic to use your external -IP address. This can be accomplished using the following configuration -on the host: + + Networking is implemented using a pair of virtual Ethernet devices. The + network interface in the container is called eth0, while + the matching interface in the host is called + ve-container-name (e.g., + ve-foo). The container has its own network namespace and + the CAP_NET_ADMIN capability, so it can perform arbitrary + network configuration such as setting up firewall rules, without affecting or + having access to the host’s network. + + + By default, containers cannot talk to the outside network. If you want that, + you should set up Network Address Translation (NAT) rules on the host to + rewrite container traffic to use your external IP address. This can be + accomplished using the following configuration on the host: = true; = ["ve-+"]; = "eth0"; -where eth0 should be replaced with the desired -external interface. Note that ve-+ is a wildcard -that matches all container interfaces. - -If you are using Network Manager, you need to explicitly prevent -it from managing container interfaces: + where eth0 should be replaced with the desired external + interface. Note that ve-+ is a wildcard that matches all + container interfaces. + + + If you are using Network Manager, you need to explicitly prevent it from + managing container interfaces: networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - - + diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml index 4cd2c8ae5563..0d3355e56a58 100644 --- a/nixos/doc/manual/administration/containers.xml +++ b/nixos/doc/manual/administration/containers.xml @@ -3,32 +3,32 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-containers"> - -Container Management - -NixOS allows you to easily run other NixOS instances as -containers. Containers are a light-weight -approach to virtualisation that runs software in the container at the -same speed as in the host system. NixOS containers share the Nix store -of the host, making container creation very efficient. - -Currently, NixOS containers are not perfectly isolated -from the host system. This means that a user with root access to the -container can do things that affect the host. So you should not give -container root access to untrusted users. - -NixOS containers can be created in two ways: imperatively, using -the command nixos-container, and declaratively, by -specifying them in your configuration.nix. The -declarative approach implies that containers get upgraded along with -your host system when you run nixos-rebuild, which -is often not what you want. By contrast, in the imperative approach, -containers are configured and updated independently from the host -system. - - - - - + Container Management + + NixOS allows you to easily run other NixOS instances as + containers. Containers are a light-weight approach to + virtualisation that runs software in the container at the same speed as in + the host system. NixOS containers share the Nix store of the host, making + container creation very efficient. + + + + Currently, NixOS containers are not perfectly isolated from the host system. + This means that a user with root access to the container can do things that + affect the host. So you should not give container root access to untrusted + users. + + + + NixOS containers can be created in two ways: imperatively, using the command + nixos-container, and declaratively, by specifying them in + your configuration.nix. The declarative approach implies + that containers get upgraded along with your host system when you run + nixos-rebuild, which is often not what you want. By + contrast, in the imperative approach, containers are configured and updated + independently from the host system. + + + + - diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index 03db40a3bc52..bb8b7f83d9e0 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -3,20 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-cgroups"> - -Control Groups - -To keep track of the processes in a running system, systemd uses -control groups (cgroups). A control group is a -set of processes used to allocate resources such as CPU, memory or I/O -bandwidth. There can be multiple control group hierarchies, allowing -each kind of resource to be managed independently. - -The command systemd-cgls lists all control -groups in the systemd hierarchy, which is what -systemd uses to keep track of the processes belonging to each service -or user session: - + Control Groups + + To keep track of the processes in a running system, systemd uses + control groups (cgroups). A control group is a set of + processes used to allocate resources such as CPU, memory or I/O bandwidth. + There can be multiple control group hierarchies, allowing each kind of + resource to be managed independently. + + + The command systemd-cgls lists all control groups in the + systemd hierarchy, which is what systemd uses to keep + track of the processes belonging to each service or user session: $ systemd-cgls ├─user @@ -34,40 +32,34 @@ $ systemd-cgls │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf └─ ... - -Similarly, systemd-cgls cpu shows the cgroups in -the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. -By default, every systemd service gets its own CPU cgroup, while all -user sessions are in the top-level CPU cgroup. This ensures, for -instance, that a thousand run-away processes in the -httpd.service cgroup cannot starve the CPU for one -process in the postgresql.service cgroup. (By -contrast, it they were in the same cgroup, then the PostgreSQL process -would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s -CPU share in configuration.nix: - + Similarly, systemd-cgls cpu shows the cgroups in the CPU + hierarchy, which allows per-cgroup CPU scheduling priorities. By default, + every systemd service gets its own CPU cgroup, while all user sessions are in + the top-level CPU cgroup. This ensures, for instance, that a thousand + run-away processes in the httpd.service cgroup cannot + starve the CPU for one process in the postgresql.service + cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL + process would get 1/1001 of the cgroup’s CPU time.) You can limit a + service’s CPU share in configuration.nix: systemd.services.httpd.serviceConfig.CPUShares = 512; - -By default, every cgroup has 1024 CPU shares, so this will halve the -CPU allocation of the httpd.service cgroup. - -There also is a memory hierarchy that -controls memory allocation limits; by default, all processes are in -the top-level cgroup, so any service or session can exhaust all -available memory. Per-cgroup memory limits can be specified in -configuration.nix; for instance, to limit -httpd.service to 512 MiB of RAM (excluding swap): - + By default, every cgroup has 1024 CPU shares, so this will halve the CPU + allocation of the httpd.service cgroup. + + + There also is a memory hierarchy that controls memory + allocation limits; by default, all processes are in the top-level cgroup, so + any service or session can exhaust all available memory. Per-cgroup memory + limits can be specified in configuration.nix; for + instance, to limit httpd.service to 512 MiB of RAM + (excluding swap): systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; - - - -The command systemd-cgtop shows a -continuously updated list of all cgroups with their CPU and memory -usage. - + + + The command systemd-cgtop shows a continuously updated + list of all cgroups with their CPU and memory usage. + diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 79b230e5fc7f..2a98fb126231 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -3,14 +3,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-declarative-containers"> + Declarative Container Specification -Declarative Container Specification - -You can also specify containers and their configuration in the -host’s configuration.nix. For example, the -following specifies that there shall be a container named -database running PostgreSQL: - + + You can also specify containers and their configuration in the host’s + configuration.nix. For example, the following specifies + that there shall be a container named database running + PostgreSQL: containers.database = { config = @@ -20,18 +19,18 @@ containers.database = }; }; + If you run nixos-rebuild switch, the container will be + built. If the container was already running, it will be updated in place, + without rebooting. The container can be configured to start automatically by + setting containers.database.autoStart = true in its + configuration. + -If you run nixos-rebuild switch, the container will -be built. If the container was already running, it will be -updated in place, without rebooting. The container can be configured to -start automatically by setting containers.database.autoStart = true -in its configuration. - -By default, declarative containers share the network namespace -of the host, meaning that they can listen on (privileged) -ports. However, they cannot change the network configuration. You can -give a container its own network as follows: - + + By default, declarative containers share the network namespace of the host, + meaning that they can listen on (privileged) ports. However, they cannot + change the network configuration. You can give a container its own network as + follows: containers.database = { privateNetwork = true; @@ -39,22 +38,23 @@ containers.database = { localAddress = "192.168.100.11"; }; + This gives the container a private virtual Ethernet interface with IP address + 192.168.100.11, which is hooked up to a virtual Ethernet + interface on the host with IP address 192.168.100.10. (See + the next section for details on container networking.) + -This gives the container a private virtual Ethernet interface with IP -address 192.168.100.11, which is hooked up to a -virtual Ethernet interface on the host with IP address -192.168.100.10. (See the next section for details -on container networking.) - -To disable the container, just remove it from -configuration.nix and run nixos-rebuild -switch. Note that this will not delete the root directory of -the container in /var/lib/containers. Containers can be -destroyed using the imperative method: nixos-container destroy - foo. - -Declarative containers can be started and stopped using the -corresponding systemd service, e.g. systemctl start -container@database. + + To disable the container, just remove it from + configuration.nix and run nixos-rebuild + switch. Note that this will not delete the root directory of the + container in /var/lib/containers. Containers can be + destroyed using the imperative method: nixos-container destroy + foo. + + + Declarative containers can be started and stopped using the corresponding + systemd service, e.g. systemctl start container@database. + diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index d39ac7f8bef4..9cc7ca3e672a 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -3,101 +3,85 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-imperative-containers"> + Imperative Container Management -Imperative Container Management - -We’ll cover imperative container management using -nixos-container first. -Be aware that container management is currently only possible -as root. - -You create a container with -identifier foo as follows: + + We’ll cover imperative container management using + nixos-container first. Be aware that container management + is currently only possible as root. + + + You create a container with identifier foo as follows: # nixos-container create foo - -This creates the container’s root directory in -/var/lib/containers/foo and a small configuration -file in /etc/containers/foo.conf. It also builds -the container’s initial system configuration and stores it in -/nix/var/nix/profiles/per-container/foo/system. You -can modify the initial configuration of the container on the command -line. For instance, to create a container that has -sshd running, with the given public key for -root: - + This creates the container’s root directory in + /var/lib/containers/foo and a small configuration file + in /etc/containers/foo.conf. It also builds the + container’s initial system configuration and stores it in + /nix/var/nix/profiles/per-container/foo/system. You can + modify the initial configuration of the container on the command line. For + instance, to create a container that has sshd running, + with the given public key for root: # nixos-container create foo --config ' = true; users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' + - - -Creating a container does not start it. To start the container, -run: - + + Creating a container does not start it. To start the container, run: # nixos-container start foo - -This command will return as soon as the container has booted and has -reached multi-user.target. On the host, the -container runs within a systemd unit called -container@container-name.service. -Thus, if something went wrong, you can get status info using -systemctl: - + This command will return as soon as the container has booted and has reached + multi-user.target. On the host, the container runs within + a systemd unit called + container@container-name.service. + Thus, if something went wrong, you can get status info using + systemctl: # systemctl status container@foo + - - -If the container has started successfully, you can log in as -root using the root-login operation: - + + If the container has started successfully, you can log in as root using the + root-login operation: # nixos-container root-login foo [root@foo:~]# - -Note that only root on the host can do this (since there is no -authentication). You can also get a regular login prompt using the -login operation, which is available to all users on -the host: - + Note that only root on the host can do this (since there is no + authentication). You can also get a regular login prompt using the + login operation, which is available to all users on the + host: # nixos-container login foo foo login: alice Password: *** - -With nixos-container run, you can execute arbitrary -commands in the container: - + With nixos-container run, you can execute arbitrary + commands in the container: # nixos-container run foo -- uname -a Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux + - - -There are several ways to change the configuration of the -container. First, on the host, you can edit -/var/lib/container/name/etc/nixos/configuration.nix, -and run - + + There are several ways to change the configuration of the container. First, + on the host, you can edit + /var/lib/container/name/etc/nixos/configuration.nix, + and run # nixos-container update foo - -This will build and activate the new configuration. You can also -specify a new configuration on the command line: - + This will build and activate the new configuration. You can also specify a + new configuration on the command line: # nixos-container update foo --config ' = true; @@ -108,26 +92,25 @@ specify a new configuration on the command line: # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… + However, note that this will overwrite the container’s + /etc/nixos/configuration.nix. + -However, note that this will overwrite the container’s -/etc/nixos/configuration.nix. - -Alternatively, you can change the configuration from within the -container itself by running nixos-rebuild switch -inside the container. Note that the container by default does not have -a copy of the NixOS channel, so you should run nix-channel ---update first. - -Containers can be stopped and started using -nixos-container stop and nixos-container -start, respectively, or by using -systemctl on the container’s service unit. To -destroy a container, including its file system, do + + Alternatively, you can change the configuration from within the container + itself by running nixos-rebuild switch inside the + container. Note that the container by default does not have a copy of the + NixOS channel, so you should run nix-channel --update + first. + + + Containers can be stopped and started using nixos-container + stop and nixos-container start, respectively, or + by using systemctl on the container’s service unit. To + destroy a container, including its file system, do # nixos-container destroy foo - - - + diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml index 1d5df7770e29..a41936b373d6 100644 --- a/nixos/doc/manual/administration/logging.xml +++ b/nixos/doc/manual/administration/logging.xml @@ -3,26 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-logging"> - -Logging - -System-wide logging is provided by systemd’s -journal, which subsumes traditional logging -daemons such as syslogd and klogd. Log entries are kept in binary -files in /var/log/journal/. The command -journalctl allows you to see the contents of the -journal. For example, - + Logging + + System-wide logging is provided by systemd’s journal, + which subsumes traditional logging daemons such as syslogd and klogd. Log + entries are kept in binary files in /var/log/journal/. + The command journalctl allows you to see the contents of + the journal. For example, $ journalctl -b - -shows all journal entries since the last reboot. (The output of -journalctl is piped into less by -default.) You can use various options and match operators to restrict -output to messages of interest. For instance, to get all messages -from PostgreSQL: - + shows all journal entries since the last reboot. (The output of + journalctl is piped into less by + default.) You can use various options and match operators to restrict output + to messages of interest. For instance, to get all messages from PostgreSQL: $ journalctl -u postgresql.service -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- @@ -32,21 +26,18 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections - -Or to get all messages since the last reboot that have at least a -“critical” severity level: - + Or to get all messages since the last reboot that have at least a + “critical” severity level: $ journalctl -b -p crit Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) - - - -The system journal is readable by root and by users in the -wheel and systemd-journal -groups. All users have a private journal that can be read using -journalctl. - - \ No newline at end of file + + + The system journal is readable by root and by users in the + wheel and systemd-journal groups. All + users have a private journal that can be read using + journalctl. + + diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml index 17a1609e5579..71e3f9ea665d 100644 --- a/nixos/doc/manual/administration/maintenance-mode.xml +++ b/nixos/doc/manual/administration/maintenance-mode.xml @@ -3,16 +3,14 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-maintenance-mode"> + Maintenance Mode -Maintenance Mode - -You can enter rescue mode by running: - + + You can enter rescue mode by running: # systemctl rescue - -This will eventually give you a single-user root shell. Systemd will -stop (almost) all system services. To get out of maintenance mode, -just exit from the rescue shell. - + This will eventually give you a single-user root shell. Systemd will stop + (almost) all system services. To get out of maintenance mode, just exit from + the rescue shell. + diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml index 91f9eb4e22c6..570f58358845 100644 --- a/nixos/doc/manual/administration/network-problems.xml +++ b/nixos/doc/manual/administration/network-problems.xml @@ -3,31 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-network-issues"> + Network Problems -Network Problems - -Nix uses a so-called binary cache to -optimise building a package from source into downloading it as a -pre-built binary. That is, whenever a command like -nixos-rebuild needs a path in the Nix store, Nix -will try to download that path from the Internet rather than build it -from source. The default binary cache is -https://cache.nixos.org/. If this cache is unreachable, -Nix operations may take a long time due to HTTP connection timeouts. -You can disable the use of the binary cache by adding , e.g. - + + Nix uses a so-called binary cache to optimise building a + package from source into downloading it as a pre-built binary. That is, + whenever a command like nixos-rebuild needs a path in the + Nix store, Nix will try to download that path from the Internet rather than + build it from source. The default binary cache is + https://cache.nixos.org/. If this cache is unreachable, Nix + operations may take a long time due to HTTP connection timeouts. You can + disable the use of the binary cache by adding , e.g. # nixos-rebuild switch --option use-binary-caches false - -If you have an alternative binary cache at your disposal, you can use -it instead: - + If you have an alternative binary cache at your disposal, you can use it + instead: # nixos-rebuild switch --option binary-caches http://my-cache.example.org/ - - - + diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml index 23f3a3219c6a..a5abd6f02588 100644 --- a/nixos/doc/manual/administration/rebooting.xml +++ b/nixos/doc/manual/administration/rebooting.xml @@ -3,42 +3,33 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-rebooting"> - -Rebooting and Shutting Down - -The system can be shut down (and automatically powered off) by -doing: - + Rebooting and Shutting Down + + The system can be shut down (and automatically powered off) by doing: # shutdown - -This is equivalent to running systemctl -poweroff. - -To reboot the system, run - + This is equivalent to running systemctl poweroff. + + + To reboot the system, run # reboot - -which is equivalent to systemctl reboot. -Alternatively, you can quickly reboot the system using -kexec, which bypasses the BIOS by directly loading -the new kernel into memory: - + which is equivalent to systemctl reboot. Alternatively, + you can quickly reboot the system using kexec, which + bypasses the BIOS by directly loading the new kernel into memory: # systemctl kexec - - - -The machine can be suspended to RAM (if supported) using -systemctl suspend, and suspended to disk using -systemctl hibernate. - -These commands can be run by any user who is logged in locally, -i.e. on a virtual console or in X11; otherwise, the user is asked for -authentication. - + + + The machine can be suspended to RAM (if supported) using systemctl + suspend, and suspended to disk using systemctl + hibernate. + + + These commands can be run by any user who is logged in locally, i.e. on a + virtual console or in X11; otherwise, the user is asked for authentication. + diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml index ae621f33de2c..07c6acaa469c 100644 --- a/nixos/doc/manual/administration/rollback.xml +++ b/nixos/doc/manual/administration/rollback.xml @@ -3,46 +3,39 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-rollback"> + Rolling Back Configuration Changes -Rolling Back Configuration Changes - -After running nixos-rebuild to switch to a -new configuration, you may find that the new configuration doesn’t -work very well. In that case, there are several ways to return to a -previous configuration. - -First, the GRUB boot manager allows you to boot into any -previous configuration that hasn’t been garbage-collected. These -configurations can be found under the GRUB submenu “NixOS - All -configurations”. This is especially useful if the new configuration -fails to boot. After the system has booted, you can make the selected -configuration the default for subsequent boots: + + After running nixos-rebuild to switch to a new + configuration, you may find that the new configuration doesn’t work very + well. In that case, there are several ways to return to a previous + configuration. + + + First, the GRUB boot manager allows you to boot into any previous + configuration that hasn’t been garbage-collected. These configurations can + be found under the GRUB submenu “NixOS - All configurations”. This is + especially useful if the new configuration fails to boot. After the system + has booted, you can make the selected configuration the default for + subsequent boots: # /run/current-system/bin/switch-to-configuration boot + - - -Second, you can switch to the previous configuration in a running -system: - + + Second, you can switch to the previous configuration in a running system: # nixos-rebuild switch --rollback - -This is equivalent to running: - + This is equivalent to running: # /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch - -where N is the number of the NixOS system -configuration. To get a list of the available configurations, do: - + where N is the number of the NixOS system + configuration. To get a list of the available configurations, do: $ ls -l /nix/var/nix/profiles/system-*-link ... lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 - - - + diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 9091511ed527..786dd5e2390d 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -3,22 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-running"> - -Administration - - -This chapter describes various aspects of managing a running -NixOS system, such as how to use the systemd -service manager. - - - - - - - - - - - + Administration + + + This chapter describes various aspects of managing a running NixOS system, + such as how to use the systemd service manager. + + + + + + + + + + diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml index 1627c7a2fdeb..0c2085c81559 100644 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -3,26 +3,23 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-systemctl"> - -Service Management - -In NixOS, all system services are started and monitored using -the systemd program. Systemd is the “init” process of the system -(i.e. PID 1), the parent of all other processes. It manages a set of -so-called “units”, which can be things like system services -(programs), but also mount points, swap files, devices, targets -(groups of units) and more. Units can have complex dependencies; for -instance, one unit can require that another unit must be successfully -started before the first unit can be started. When the system boots, -it starts a unit named default.target; the -dependencies of this unit cause all system services to be started, -file systems to be mounted, swap files to be activated, and so -on. - -The command systemctl is the main way to -interact with systemd. Without any arguments, it -shows the status of active units: - + Service Management + + In NixOS, all system services are started and monitored using the systemd + program. Systemd is the “init” process of the system (i.e. PID 1), the + parent of all other processes. It manages a set of so-called “units”, + which can be things like system services (programs), but also mount points, + swap files, devices, targets (groups of units) and more. Units can have + complex dependencies; for instance, one unit can require that another unit + must be successfully started before the first unit can be started. When the + system boots, it starts a unit named default.target; the + dependencies of this unit cause all system services to be started, file + systems to be mounted, swap files to be activated, and so on. + + + The command systemctl is the main way to interact with + systemd. Without any arguments, it shows the status of + active units: $ systemctl -.mount loaded active mounted / @@ -31,12 +28,10 @@ sshd.service loaded active running SSH Daemon graphical.target loaded active active Graphical Interface ... - - - -You can ask for detailed status information about a unit, for -instance, the PostgreSQL database service: - + + + You can ask for detailed status information about a unit, for instance, the + PostgreSQL database service: $ systemctl status postgresql.service postgresql.service - PostgreSQL Server @@ -56,28 +51,22 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. - -Note that this shows the status of the unit (active and running), all -the processes belonging to the service, as well as the most recent log -messages from the service. - - - -Units can be stopped, started or restarted: - + Note that this shows the status of the unit (active and running), all the + processes belonging to the service, as well as the most recent log messages + from the service. + + + Units can be stopped, started or restarted: # systemctl stop postgresql.service # systemctl start postgresql.service # systemctl restart postgresql.service - -These operations are synchronous: they wait until the service has -finished starting or stopping (or has failed). Starting a unit will -cause the dependencies of that unit to be started as well (if -necessary). - + These operations are synchronous: they wait until the service has finished + starting or stopping (or has failed). Starting a unit will cause the + dependencies of that unit to be started as well (if necessary). + - diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml index 9f567042b727..a4ca3b651e20 100644 --- a/nixos/doc/manual/administration/store-corruption.xml +++ b/nixos/doc/manual/administration/store-corruption.xml @@ -3,35 +3,34 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-store-corruption"> + Nix Store Corruption -Nix Store Corruption - -After a system crash, it’s possible for files in the Nix store -to become corrupted. (For instance, the Ext4 file system has the -tendency to replace un-synced files with zero bytes.) NixOS tries -hard to prevent this from happening: it performs a -sync before switching to a new configuration, and -Nix’s database is fully transactional. If corruption still occurs, -you may be able to fix it automatically. - -If the corruption is in a path in the closure of the NixOS -system configuration, you can fix it by doing + + After a system crash, it’s possible for files in the Nix store to become + corrupted. (For instance, the Ext4 file system has the tendency to replace + un-synced files with zero bytes.) NixOS tries hard to prevent this from + happening: it performs a sync before switching to a new + configuration, and Nix’s database is fully transactional. If corruption + still occurs, you may be able to fix it automatically. + + + If the corruption is in a path in the closure of the NixOS system + configuration, you can fix it by doing # nixos-rebuild switch --repair + This will cause Nix to check every path in the closure, and if its + cryptographic hash differs from the hash recorded in Nix’s database, the + path is rebuilt or redownloaded. + -This will cause Nix to check every path in the closure, and if its -cryptographic hash differs from the hash recorded in Nix’s database, -the path is rebuilt or redownloaded. - -You can also scan the entire Nix store for corrupt paths: - + + You can also scan the entire Nix store for corrupt paths: # nix-store --verify --check-contents --repair - -Any corrupt paths will be redownloaded if they’re available in a -binary cache; otherwise, they cannot be repaired. - + Any corrupt paths will be redownloaded if they’re available in a binary + cache; otherwise, they cannot be repaired. + diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index 351fb1883310..6496e7bde387 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -3,16 +3,14 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-troubleshooting"> - -Troubleshooting - -This chapter describes solutions to common problems you might -encounter when you manage your NixOS system. - - - - - - - + Troubleshooting + + This chapter describes solutions to common problems you might encounter when + you manage your NixOS system. + + + + + + diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml index 0a7eb8cd123c..1d95cfb22b69 100644 --- a/nixos/doc/manual/administration/user-sessions.xml +++ b/nixos/doc/manual/administration/user-sessions.xml @@ -3,14 +3,12 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-user-sessions"> - -User Sessions - -Systemd keeps track of all users who are logged into the system -(e.g. on a virtual console or remotely via SSH). The command -loginctl allows querying and manipulating user -sessions. For instance, to list all user sessions: - + User Sessions + + Systemd keeps track of all users who are logged into the system (e.g. on a + virtual console or remotely via SSH). The command loginctl + allows querying and manipulating user sessions. For instance, to list all + user sessions: $ loginctl SESSION UID USER SEAT @@ -18,12 +16,10 @@ $ loginctl c3 0 root seat0 c4 500 alice - -This shows that two users are logged in locally, while another is -logged in remotely. (“Seats” are essentially the combinations of -displays and input devices attached to the system; usually, there is -only one seat.) To get information about a session: - + This shows that two users are logged in locally, while another is logged in + remotely. (“Seats” are essentially the combinations of displays and input + devices attached to the system; usually, there is only one seat.) To get + information about a session: $ loginctl session-status c3 c3 - root (0) @@ -38,16 +34,12 @@ c3 - root (0) ├─10339 -bash └─10355 w3m nixos.org - -This shows that the user is logged in on virtual console 3. It also -lists the processes belonging to this session. Since systemd keeps -track of this, you can terminate a session in a way that ensures that -all the session’s processes are gone: - + This shows that the user is logged in on virtual console 3. It also lists the + processes belonging to this session. Since systemd keeps track of this, you + can terminate a session in a way that ensures that all the session’s + processes are gone: # loginctl terminate-session c3 - - - + diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml index f794085295cf..5bf0635cc1aa 100644 --- a/nixos/doc/manual/configuration/abstractions.xml +++ b/nixos/doc/manual/configuration/abstractions.xml @@ -3,12 +3,11 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-module-abstractions"> + Abstractions -Abstractions - -If you find yourself repeating yourself over and over, it’s time -to abstract. Take, for instance, this Apache HTTP Server configuration: - + + If you find yourself repeating yourself over and over, it’s time to + abstract. Take, for instance, this Apache HTTP Server configuration: { = @@ -28,11 +27,9 @@ to abstract. Take, for instance, this Apache HTTP Server configuration: ]; } - -It defines two virtual hosts with nearly identical configuration; the -only difference is that the second one has SSL enabled. To prevent -this duplication, we can use a let: - + It defines two virtual hosts with nearly identical configuration; the only + difference is that the second one has SSL enabled. To prevent this + duplication, we can use a let: let exampleOrgCommon = @@ -53,17 +50,16 @@ in ]; } + The let exampleOrgCommon = ... + defines a variable named exampleOrgCommon. The + // operator merges two attribute sets, so the + configuration of the second virtual host is the set + exampleOrgCommon extended with the SSL options. + -The let exampleOrgCommon = -... defines a variable named -exampleOrgCommon. The // -operator merges two attribute sets, so the configuration of the second -virtual host is the set exampleOrgCommon extended -with the SSL options. - -You can write a let wherever an expression is -allowed. Thus, you also could have written: - + + You can write a let wherever an expression is allowed. + Thus, you also could have written: { = @@ -73,17 +69,16 @@ allowed. Thus, you also could have written: ]; } + but not { let exampleOrgCommon = ...; in + ...; } since attributes (as opposed to + attribute values) are not expressions. + -but not { let exampleOrgCommon = -...; in ...; -} since attributes (as opposed to attribute values) are not -expressions. - -Functions provide another method of -abstraction. For instance, suppose that we want to generate lots of -different virtual hosts, all with identical configuration except for -the host name. This can be done as follows: - + + Functions provide another method of abstraction. For + instance, suppose that we want to generate lots of different virtual hosts, + all with identical configuration except for the host name. This can be done + as follows: { = @@ -101,16 +96,15 @@ the host name. This can be done as follows: ]; } + Here, makeVirtualHost is a function that takes a single + argument name and returns the configuration for a virtual + host. That function is then called for several names to produce the list of + virtual host configurations. + -Here, makeVirtualHost is a function that takes a -single argument name and returns the configuration -for a virtual host. That function is then called for several names to -produce the list of virtual host configurations. - -We can further improve on this by using the function -map, which applies another function to every -element in a list: - + + We can further improve on this by using the function map, + which applies another function to every element in a list: { = @@ -120,16 +114,15 @@ element in a list: [ "example.org" "example.com" "example.gov" "example.nl" ]; } + (The function map is called a higher-order + function because it takes another function as an argument.) + -(The function map is called a -higher-order function because it takes another -function as an argument.) - -What if you need more than one argument, for instance, if we -want to use a different documentRoot for each -virtual host? Then we can make makeVirtualHost a -function that takes a set as its argument, like this: - + + What if you need more than one argument, for instance, if we want to use a + different documentRoot for each virtual host? Then we can + make makeVirtualHost a function that takes a + set as its argument, like this: { = @@ -147,10 +140,9 @@ function that takes a set as its argument, like this: ]; } - -But in this case (where every root is a subdirectory of -/sites named after the virtual host), it would -have been shorter to define makeVirtualHost as + But in this case (where every root is a subdirectory of + /sites named after the virtual host), it would have been + shorter to define makeVirtualHost as makeVirtualHost = name: { hostName = name; @@ -158,9 +150,7 @@ makeVirtualHost = name: adminAddr = "alice@example.org"; }; - -Here, the construct -${...} allows the result -of an expression to be spliced into a string. - + Here, the construct ${...} + allows the result of an expression to be spliced into a string. + diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml index c53b9598109c..00e595c7cb7f 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml @@ -3,22 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ad-hoc-network-config"> + Ad-Hoc Configuration -Ad-Hoc Configuration - -You can use to specify -shell commands to be run at the end of -network-setup.service. This is useful for doing -network configuration not covered by the existing NixOS modules. For -instance, to statically configure an IPv6 address: - + + You can use to specify shell + commands to be run at the end of network-setup.service. + This is useful for doing network configuration not covered by the existing + NixOS modules. For instance, to statically configure an IPv6 address: = '' ip -6 addr add 2001:610:685:1::1/64 dev eth0 ''; - - - + diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml index a147291c4f3d..19159d8db5b6 100644 --- a/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml @@ -3,61 +3,59 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ad-hoc-packages"> + Ad-Hoc Package Management -Ad-Hoc Package Management - -With the command nix-env, you can install and -uninstall packages from the command line. For instance, to install -Mozilla Thunderbird: - + + With the command nix-env, you can install and uninstall + packages from the command line. For instance, to install Mozilla Thunderbird: $ nix-env -iA nixos.thunderbird + If you invoke this as root, the package is installed in the Nix profile + /nix/var/nix/profiles/default and visible to all users + of the system; otherwise, the package ends up in + /nix/var/nix/profiles/per-user/username/profile + and is not visible to other users. The flag specifies the + package by its attribute name; without it, the package is installed by + matching against its package name (e.g. thunderbird). The + latter is slower because it requires matching against all available Nix + packages, and is ambiguous if there are multiple matching packages. + -If you invoke this as root, the package is installed in the Nix -profile /nix/var/nix/profiles/default and visible -to all users of the system; otherwise, the package ends up in -/nix/var/nix/profiles/per-user/username/profile -and is not visible to other users. The flag -specifies the package by its attribute name; without it, the package -is installed by matching against its package name -(e.g. thunderbird). The latter is slower because -it requires matching against all available Nix packages, and is -ambiguous if there are multiple matching packages. - -Packages come from the NixOS channel. You typically upgrade a -package by updating to the latest version of the NixOS channel: + + Packages come from the NixOS channel. You typically upgrade a package by + updating to the latest version of the NixOS channel: $ nix-channel --update nixos -and then running nix-env -i again. Other packages -in the profile are not affected; this is the -crucial difference with the declarative style of package management, -where running nixos-rebuild switch causes all -packages to be updated to their current versions in the NixOS channel. -You can however upgrade all packages for which there is a newer -version by doing: + and then running nix-env -i again. Other packages in the + profile are not affected; this is the crucial difference + with the declarative style of package management, where running + nixos-rebuild switch causes all packages to be updated to + their current versions in the NixOS channel. You can however upgrade all + packages for which there is a newer version by doing: $ nix-env -u '*' - + -A package can be uninstalled using the -flag: + + A package can be uninstalled using the flag: $ nix-env -e thunderbird - + -Finally, you can roll back an undesirable -nix-env action: + + Finally, you can roll back an undesirable nix-env action: $ nix-env --rollback - - -nix-env has many more flags. For details, -see the -nix-env1 -manpage or the Nix manual. + + + nix-env has many more flags. For details, see the + + nix-env + 1 manpage or the Nix manual. + diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index ae58f61d73ed..b59287a622e6 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -3,43 +3,36 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-custom-packages"> + Adding Custom Packages -Adding Custom Packages - -It’s possible that a package you need is not available in NixOS. -In that case, you can do two things. First, you can clone the Nixpkgs -repository, add the package to your clone, and (optionally) submit a -patch or pull request to have it accepted into the main Nixpkgs -repository. This is described in detail in the Nixpkgs manual. -In short, you clone Nixpkgs: - + + It’s possible that a package you need is not available in NixOS. In that + case, you can do two things. First, you can clone the Nixpkgs repository, add + the package to your clone, and (optionally) submit a patch or pull request to + have it accepted into the main Nixpkgs repository. This is described in + detail in the Nixpkgs + manual. In short, you clone Nixpkgs: $ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs - -Then you write and test the package as described in the Nixpkgs -manual. Finally, you add it to -environment.systemPackages, e.g. - + Then you write and test the package as described in the Nixpkgs manual. + Finally, you add it to environment.systemPackages, e.g. = [ pkgs.my-package ]; - -and you run nixos-rebuild, specifying your own -Nixpkgs tree: - + and you run nixos-rebuild, specifying your own Nixpkgs + tree: # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs + - - -The second possibility is to add the package outside of the -Nixpkgs tree. For instance, here is how you specify a build of the -GNU Hello -package directly in configuration.nix: - + + The second possibility is to add the package outside of the Nixpkgs tree. For + instance, here is how you specify a build of the + GNU Hello + package directly in configuration.nix: = let @@ -53,13 +46,12 @@ package directly in configuration.nix: in [ my-hello ]; - -Of course, you can also move the definition of -my-hello into a separate Nix expression, e.g. + Of course, you can also move the definition of my-hello + into a separate Nix expression, e.g. = [ (import ./my-hello.nix) ]; -where my-hello.nix contains: + where my-hello.nix contains: with import <nixpkgs> {}; # bring all of Nixpkgs into scope @@ -71,14 +63,11 @@ stdenv.mkDerivation rec { }; } - -This allows testing the package easily: + This allows testing the package easily: $ nix-build my-hello.nix $ ./result/bin/hello Hello, world! - - - + diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index d4ca15bb3e72..a9420b3fc921 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -3,28 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-configuration-file"> + NixOS Configuration File -NixOS Configuration File - -The NixOS configuration file generally looks like this: - + + The NixOS configuration file generally looks like this: { config, pkgs, ... }: { option definitions } - -The first line ({ config, pkgs, ... }:) denotes -that this is actually a function that takes at least the two arguments - config and pkgs. (These are -explained later.) The function returns a set of -option definitions ({ ... }). These definitions have the -form name = -value, where -name is the name of an option and -value is its value. For example, - + The first line ({ config, pkgs, ... }:) denotes that this + is actually a function that takes at least the two arguments + config and pkgs. (These are explained + later.) The function returns a set of option definitions + ({ ... }). These definitions + have the form name = + value, where + name is the name of an option and + value is its value. For example, { config, pkgs, ... }: @@ -33,19 +30,19 @@ form name = = "/webroot"; } + defines a configuration with three option definitions that together enable + the Apache HTTP Server with /webroot as the document + root. + -defines a configuration with three option definitions that together -enable the Apache HTTP Server with /webroot as -the document root. - -Sets can be nested, and in fact dots in option names are -shorthand for defining a set containing another set. For instance, - defines a set named -services that contains a set named -httpd, which in turn contains an option definition -named enable with value true. -This means that the example above can also be written as: - + + Sets can be nested, and in fact dots in option names are shorthand for + defining a set containing another set. For instance, + defines a set named + services that contains a set named + httpd, which in turn contains an option definition named + enable with value true. This means that + the example above can also be written as: { config, pkgs, ... }: @@ -58,46 +55,44 @@ This means that the example above can also be written as: }; } + which may be more convenient if you have lots of option definitions that + share the same prefix (such as services.httpd). + -which may be more convenient if you have lots of option definitions -that share the same prefix (such as -services.httpd). - -NixOS checks your option definitions for correctness. For -instance, if you try to define an option that doesn’t exist (that is, -doesn’t have a corresponding option declaration), -nixos-rebuild will give an error like: + + NixOS checks your option definitions for correctness. For instance, if you + try to define an option that doesn’t exist (that is, doesn’t have a + corresponding option declaration), + nixos-rebuild will give an error like: The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. -Likewise, values in option definitions must have a correct type. For -instance, must be a Boolean -(true or false). Trying to give -it a value of another type, such as a string, will cause an error: + Likewise, values in option definitions must have a correct type. For + instance, must be a Boolean + (true or false). Trying to give it a + value of another type, such as a string, will cause an error: The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. + - - -Options have various types of values. The most important are: - - - + + Options have various types of values. The most important are: + + Strings - Strings are enclosed in double quotes, e.g. - + + Strings are enclosed in double quotes, e.g. = "dexter"; - - Special characters can be escaped by prefixing them with a - backslash (e.g. \"). - - Multi-line strings can be enclosed in double - single quotes, e.g. - + Special characters can be escaped by prefixing them with a backslash + (e.g. \"). + + + Multi-line strings can be enclosed in double single + quotes, e.g. = '' @@ -105,58 +100,52 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no 10.0.0.1 server ''; - - The main difference is that it strips from each line - a number of spaces equal to the minimal indentation of - the string as a whole (disregarding the indentation of - empty lines), and that characters like - " and \ are not special - (making it more convenient for including things like shell - code). - See more info about this in the Nix manual here. + The main difference is that it strips from each line a number of spaces + equal to the minimal indentation of the string as a whole (disregarding + the indentation of empty lines), and that characters like + " and \ are not special (making it + more convenient for including things like shell code). See more info + about this in the Nix manual + here. + - - - + + Booleans - These can be true or - false, e.g. - + + These can be true or false, e.g. = true; = false; - + - - - + + Integers - For example, - + + For example, ."net.ipv4.tcp_keepalive_time" = 60; - (Note that here the attribute name - net.ipv4.tcp_keepalive_time is enclosed in - quotes to prevent it from being interpreted as a set named - net containing a set named - ipv4, and so on. This is because it’s not a - NixOS option but the literal name of a Linux kernel - setting.) + net.ipv4.tcp_keepalive_time is enclosed in quotes to + prevent it from being interpreted as a set named net + containing a set named ipv4, and so on. This is + because it’s not a NixOS option but the literal name of a Linux kernel + setting.) + - - - + + Sets - Sets were introduced above. They are name/value pairs - enclosed in braces, as in the option definition - + + Sets were introduced above. They are name/value pairs enclosed in braces, + as in the option definition ."/boot" = { device = "/dev/sda1"; @@ -164,36 +153,32 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no options = [ "rw" "data=ordered" "relatime" ]; }; - + - - - + + Lists - The important thing to note about lists is that list - elements are separated by whitespace, like this: - + + The important thing to note about lists is that list elements are + separated by whitespace, like this: = [ "fuse" "kvm-intel" "coretemp" ]; - List elements can be any other type, e.g. sets: - swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - + - - - + + Packages - Usually, the packages you need are already part of the Nix - Packages collection, which is a set that can be accessed through - the function argument pkgs. Typical uses: - + + Usually, the packages you need are already part of the Nix Packages + collection, which is a set that can be accessed through the function + argument pkgs. Typical uses: = [ pkgs.thunderbird @@ -202,16 +187,12 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; = pkgs.postgresql90; - - The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 9.0. For more - information on packages, including how to add new ones, see - . + The latter option definition changes the default PostgreSQL package used + by NixOS’s PostgreSQL service to 9.0. For more information on packages, + including how to add new ones, see . + - - - - - - + + + diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 87847f8451ec..5ef498cf9ae3 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -3,25 +3,23 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-configuration-syntax"> - -Configuration Syntax - -The NixOS configuration file -/etc/nixos/configuration.nix is actually a -Nix expression, which is the Nix package -manager’s purely functional language for describing how to build -packages and configurations. This means you have all the expressive -power of that language at your disposal, including the ability to -abstract over common patterns, which is very useful when managing -complex systems. The syntax and semantics of the Nix language are -fully described in the Configuration Syntax + + The NixOS configuration file + /etc/nixos/configuration.nix is actually a Nix + expression, which is the Nix package manager’s purely functional + language for describing how to build packages and configurations. This means + you have all the expressive power of that language at your disposal, + including the ability to abstract over common patterns, which is very useful + when managing complex systems. The syntax and semantics of the Nix language + are fully described in the + Nix -manual, but here we give a short overview of the most important -constructs useful in NixOS configuration files. - - - - - - + manual, but here we give a short overview of the most important + constructs useful in NixOS configuration files. + + + + + diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index f092c7e207ff..8d05dcd34b4d 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -3,30 +3,24 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-configuration"> - -Configuration - - - -This chapter describes how to configure various aspects of a -NixOS machine through the configuration file -/etc/nixos/configuration.nix. As described in -, changes to this file only take -effect after you run nixos-rebuild. - - - - - - - - - - - - - - + Configuration + + + This chapter describes how to configure various aspects of a NixOS machine + through the configuration file + /etc/nixos/configuration.nix. As described in + , changes to this file only take + effect after you run nixos-rebuild. + + + + + + + + + + + - diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 8b7654e9b42e..03b5bb53197b 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -3,53 +3,50 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-customising-packages"> + Customising Packages -Customising Packages + + Some packages in Nixpkgs have options to enable or disable optional + functionality or change other aspects of the package. For instance, the + Firefox wrapper package (which provides Firefox with a set of plugins such as + the Adobe Flash player) has an option to enable the Google Talk plugin. It + can be set in configuration.nix as follows: + nixpkgs.config.firefox.enableGoogleTalkPlugin = true; + -Some packages in Nixpkgs have options to enable or disable -optional functionality or change other aspects of the package. For -instance, the Firefox wrapper package (which provides Firefox with a -set of plugins such as the Adobe Flash player) has an option to enable -the Google Talk plugin. It can be set in -configuration.nix as follows: - - -nixpkgs.config.firefox.enableGoogleTalkPlugin = true; - - - -Unfortunately, Nixpkgs currently lacks a way to query -available configuration options. - -Apart from high-level options, it’s possible to tweak a package -in almost arbitrary ways, such as changing or disabling dependencies -of a package. For instance, the Emacs package in Nixpkgs by default -has a dependency on GTK+ 2. If you want to build it against GTK+ 3, -you can specify that as follows: + + + Unfortunately, Nixpkgs currently lacks a way to query available + configuration options. + + + + Apart from high-level options, it’s possible to tweak a package in almost + arbitrary ways, such as changing or disabling dependencies of a package. For + instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2. + If you want to build it against GTK+ 3, you can specify that as follows: = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + The function override performs the call to the Nix + function that produces Emacs, with the original arguments amended by the set + of arguments specified by you. So here the function argument + gtk gets the value pkgs.gtk3, causing + Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, + function application binds more weakly than list construction, so without + them, would be a list with + two elements.) + -The function override performs the call to the Nix -function that produces Emacs, with the original arguments amended by -the set of arguments specified by you. So here the function argument -gtk gets the value pkgs.gtk3, -causing Emacs to depend on GTK+ 3. (The parentheses are necessary -because in Nix, function application binds more weakly than list -construction, so without them, - would be a list with two -elements.) - -Even greater customisation is possible using the function -overrideAttrs. While the -override mechanism above overrides the arguments of -a package function, overrideAttrs allows -changing the attributes passed to mkDerivation. -This permits changing any aspect of the package, such as the source code. -For instance, if you want to override the source code of Emacs, you -can say: - + + Even greater customisation is possible using the function + overrideAttrs. While the override + mechanism above overrides the arguments of a package function, + overrideAttrs allows changing the + attributes passed to mkDerivation. + This permits changing any aspect of the package, such as the source code. For + instance, if you want to override the source code of Emacs, you can say: = [ (pkgs.emacs.overrideAttrs (oldAttrs: { @@ -58,36 +55,32 @@ can say: })) ]; + Here, overrideAttrs takes the Nix derivation specified by + pkgs.emacs and produces a new derivation in which the + original’s name and src attribute + have been replaced by the given values by re-calling + stdenv.mkDerivation. The original attributes are + accessible via the function argument, which is conventionally named + oldAttrs. + -Here, overrideAttrs takes the Nix derivation -specified by pkgs.emacs and produces a new -derivation in which the original’s name and -src attribute have been replaced by the given -values by re-calling stdenv.mkDerivation. -The original attributes are accessible via the function argument, -which is conventionally named oldAttrs. - -The overrides shown above are not global. They do not affect -the original package; other packages in Nixpkgs continue to depend on -the original rather than the customised package. This means that if -another package in your system depends on the original package, you -end up with two instances of the package. If you want to have -everything depend on your customised instance, you can apply a -global override as follows: - + + The overrides shown above are not global. They do not affect the original + package; other packages in Nixpkgs continue to depend on the original rather + than the customised package. This means that if another package in your + system depends on the original package, you end up with two instances of the + package. If you want to have everything depend on your customised instance, + you can apply a global override as follows: nixpkgs.config.packageOverrides = pkgs: { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; }; - -The effect of this definition is essentially equivalent to modifying -the emacs attribute in the Nixpkgs source tree. -Any package in Nixpkgs that depends on emacs will -be passed your customised instance. (However, the value -pkgs.emacs in -nixpkgs.config.packageOverrides refers to the -original rather than overridden instance, to prevent an infinite -recursion.) - + The effect of this definition is essentially equivalent to modifying the + emacs attribute in the Nixpkgs source tree. Any package in + Nixpkgs that depends on emacs will be passed your + customised instance. (However, the value pkgs.emacs in + nixpkgs.config.packageOverrides refers to the original + rather than overridden instance, to prevent an infinite recursion.) + diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index 4c875e6f037f..be9884fe9dce 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -3,41 +3,41 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-declarative-package-mgmt"> + Declarative Package Management -Declarative Package Management - -With declarative package management, you specify which packages -you want on your system by setting the option -. For instance, adding the -following line to configuration.nix enables the -Mozilla Thunderbird email application: - + + With declarative package management, you specify which packages you want on + your system by setting the option + . For instance, adding the + following line to configuration.nix enables the Mozilla + Thunderbird email application: = [ pkgs.thunderbird ]; + The effect of this specification is that the Thunderbird package from Nixpkgs + will be built or downloaded as part of the system when you run + nixos-rebuild switch. + -The effect of this specification is that the Thunderbird package from -Nixpkgs will be built or downloaded as part of the system when you run -nixos-rebuild switch. - -You can get a list of the available packages as follows: + + You can get a list of the available packages as follows: $ nix-env -qaP '*' --description nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded ... + The first column in the output is the attribute name, + such as nixos.thunderbird. (The nixos + prefix allows distinguishing between different channels that you might have.) + -The first column in the output is the attribute -name, such as -nixos.thunderbird. (The -nixos prefix allows distinguishing between -different channels that you might have.) + + To “uninstall” a package, simply remove it from + and run + nixos-rebuild switch. + -To “uninstall” a package, simply remove it from - and run -nixos-rebuild switch. - - - + + diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index 0ff37c38d8b0..e4c03de71b72 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -3,44 +3,44 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-file-systems"> - -File Systems - -You can define file systems using the - configuration option. For instance, the -following definition causes NixOS to mount the Ext4 file system on -device /dev/disk/by-label/data onto the mount -point /data: - + File Systems + + You can define file systems using the + configuration option. For instance, the following definition causes NixOS to + mount the Ext4 file system on device + /dev/disk/by-label/data onto the mount point + /data: ."/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; }; - -Mount points are created automatically if they don’t already exist. -For , it’s best to use the topology-independent -device aliases in /dev/disk/by-label and -/dev/disk/by-uuid, as these don’t change if the -topology changes (e.g. if a disk is moved to another IDE -controller). - -You can usually omit the file system type -(), since mount can usually -detect the type and load the necessary kernel module automatically. -However, if the file system is needed at early boot (in the initial -ramdisk) and is not ext2, ext3 -or ext4, then it’s best to specify - to ensure that the kernel module is -available. - -System startup will fail if any of the filesystems fails to mount, -dropping you to the emergency shell. -You can make a mount asynchronous and non-critical by adding -options = [ "nofail" ];. - - - - + Mount points are created automatically if they don’t already exist. For + , + it’s best to use the topology-independent device aliases in + /dev/disk/by-label and + /dev/disk/by-uuid, as these don’t change if the + topology changes (e.g. if a disk is moved to another IDE controller). + + + You can usually omit the file system type + (), + since mount can usually detect the type and load the + necessary kernel module automatically. However, if the file system is needed + at early boot (in the initial ramdisk) and is not ext2, + ext3 or ext4, then it’s best to + specify to ensure that the kernel module is + available. + + + + System startup will fail if any of the filesystems fails to mount, dropping + you to the emergency shell. You can make a mount asynchronous and + non-critical by adding + options = [ + "nofail" ];. + + + diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml index ecc21a3bdf51..b66adcedce6e 100644 --- a/nixos/doc/manual/configuration/firewall.xml +++ b/nixos/doc/manual/configuration/firewall.xml @@ -3,49 +3,44 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-firewall"> + Firewall -Firewall - -NixOS has a simple stateful firewall that blocks incoming -connections and other unexpected packets. The firewall applies to -both IPv4 and IPv6 traffic. It is enabled by default. It can be -disabled as follows: - + + NixOS has a simple stateful firewall that blocks incoming connections and + other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. + It is enabled by default. It can be disabled as follows: = false; - -If the firewall is enabled, 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: = [ 80 443 ]; + Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is + enabled (). UDP ports can be opened through + . + -Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP -ports can be opened through -. - -To open ranges of TCP ports: - + + To open ranges of TCP ports: = [ { from = 4000; to = 4007; } { from = 8000; to = 8010; } ]; + Similarly, UDP port ranges can be opened through + . + -Similarly, UDP port ranges can be opened through -. - -Also of interest is - + + Also of interest is = true; - -to allow the machine to respond to ping requests. (ICMPv6 pings are -always allowed.) - + to allow the machine to respond to ping requests. (ICMPv6 pings are always + allowed.) + diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index fbc9695c6014..71ddf41491ba 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -3,45 +3,41 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ipv4"> + IPv4 Configuration -IPv4 Configuration - -By default, NixOS uses DHCP (specifically, -dhcpcd) to automatically configure network -interfaces. However, you can configure an interface manually as -follows: - + + By default, NixOS uses DHCP (specifically, dhcpcd) to + automatically configure network interfaces. However, you can configure an + interface manually as follows: networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; - -Typically you’ll also want to set a default gateway and set of name -servers: - + Typically you’ll also want to set a default gateway and set of name + servers: = "192.168.1.1"; = [ "8.8.8.8" ]; + - - -Statically configured interfaces are set up by the systemd -service -interface-name-cfg.service. -The default gateway and name server configuration is performed by -network-setup.service. - -The host name is set using : + + + Statically configured interfaces are set up by the systemd service + interface-name-cfg.service. + The default gateway and name server configuration is performed by + network-setup.service. + + + + The host name is set using : = "cartman"; - -The default host name is nixos. Set it to the -empty string ("") to allow the DHCP server to -provide the host name. - + The default host name is nixos. Set it to the empty string + ("") to allow the DHCP server to provide the host name. + diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index e8960dc8930c..e9ab7cce4eb2 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -3,47 +3,48 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ipv6"> + IPv6 Configuration -IPv6 Configuration - -IPv6 is enabled by default. Stateless address autoconfiguration -is used to automatically assign IPv6 addresses to all interfaces. You -can disable IPv6 support globally by setting: - + + IPv6 is enabled by default. Stateless address autoconfiguration is used to + automatically assign IPv6 addresses to all interfaces. You can disable IPv6 + support globally by setting: = false; - - -You can disable IPv6 on a single interface using a normal sysctl (in this -example, we use interface eth0): + + + + You can disable IPv6 on a single interface using a normal sysctl (in this + example, we use interface eth0): ."net.ipv6.conf.eth0.disable_ipv6" = true; - - -As with IPv4 networking interfaces are automatically configured via -DHCPv6. You can configure an interface manually: + + + As with IPv4 networking interfaces are automatically configured via DHCPv6. + You can configure an interface manually: networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; - - -For configuring a gateway, optionally with explicitly specified interface: + + + For configuring a gateway, optionally with explicitly specified interface: = { address = "fe00::1"; interface = "enp0s3"; } - - -See for similar examples and additional information. - + + + See for similar examples and additional + information. + diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index b9325629256a..0990e9d932ba 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -3,29 +3,29 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-kernel-config"> - -Linux Kernel - -You can override the Linux kernel and associated packages using -the option . For instance, this -selects the Linux 3.10 kernel: + Linux Kernel + + You can override the Linux kernel and associated packages using the option + . For instance, this selects the Linux + 3.10 kernel: = pkgs.linuxPackages_3_10; -Note that this not only replaces the kernel, but also packages that -are specific to the kernel version, such as the NVIDIA video drivers. -This ensures that driver packages are consistent with the -kernel. - -The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: + Note that this not only replaces the kernel, but also packages that are + specific to the kernel version, such as the NVIDIA video drivers. This + ensures that driver packages are consistent with the kernel. + + + The default Linux kernel configuration should be fine for most users. You can + see the configuration of your current kernel with the following command: zcat /proc/config.gz -If you want to change the kernel configuration, you can use the - feature (see ). For instance, to enable -support for the kernel debugger KGDB: - + If you want to change the kernel configuration, you can use the + feature (see + ). For instance, to enable support + for the kernel debugger KGDB: nixpkgs.config.packageOverrides = pkgs: { linux_3_4 = pkgs.linux_3_4.override { @@ -36,47 +36,46 @@ nixpkgs.config.packageOverrides = pkgs: }; }; - -extraConfig takes a list of Linux kernel -configuration options, one per line. The name of the option should -not include the prefix CONFIG_. The option value -is typically y, n or -m (to build something as a kernel module). - -Kernel modules for hardware devices are generally loaded -automatically by udev. You can force a module to -be loaded via , e.g. + extraConfig takes a list of Linux kernel configuration + options, one per line. The name of the option should not include the prefix + CONFIG_. The option value is typically + y, n or m (to build + something as a kernel module). + + + Kernel modules for hardware devices are generally loaded automatically by + udev. You can force a module to be loaded via + , e.g. = [ "fuse" "kvm-intel" "coretemp" ]; -If the module is required early during the boot (e.g. to mount the -root file system), you can use -: + If the module is required early during the boot (e.g. to mount the root file + system), you can use : = [ "cifs" ]; -This causes the specified modules and their dependencies to be added -to the initial ramdisk. - -Kernel runtime parameters can be set through -, e.g. + This causes the specified modules and their dependencies to be added to the + initial ramdisk. + + + Kernel runtime parameters can be set through + , e.g. ."net.ipv4.tcp_keepalive_time" = 120; -sets the kernel’s TCP keepalive time to 120 seconds. To see the -available parameters, run sysctl -a. - -
+ sets the kernel’s TCP keepalive time to 120 seconds. To see the available + parameters, run sysctl -a. + +
Developing kernel modules - When developing kernel modules it's often convenient to run - edit-compile-run loop as quickly as possible. - - See below snippet as an example of developing mellanox - drivers. + + When developing kernel modules it's often convenient to run edit-compile-run + loop as quickly as possible. See below snippet as an example of developing + mellanox drivers. - ' -A linuxPackages.kernel.dev $ nix-shell '' -A linuxPackages.kernel $ unpackPhase @@ -84,7 +83,5 @@ $ cd linux-* $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules # insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko ]]> - -
- +
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 6c2b4cc60b5b..8a2b107e0ee8 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -3,14 +3,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-luks-file-systems"> + LUKS-Encrypted File Systems -LUKS-Encrypted File Systems - -NixOS supports file systems that are encrypted using -LUKS (Linux Unified Key Setup). For example, -here is how you create an encrypted Ext4 file system on the device -/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: - + + NixOS supports file systems that are encrypted using + LUKS (Linux Unified Key Setup). For example, here is how + you create an encrypted Ext4 file system on the device + /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: # cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d @@ -27,20 +26,15 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** # mkfs.ext4 /dev/mapper/crypted - -To ensure that this file system is automatically mounted at boot time -as /, add the following to -configuration.nix: - + To ensure that this file system is automatically mounted at boot time as + /, add the following to + configuration.nix: boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; ."/".device = "/dev/mapper/crypted"; - -Should grub be used as bootloader, and /boot is located -on an encrypted partition, it is necessary to add the following grub option: + Should grub be used as bootloader, and /boot is located + on an encrypted partition, it is necessary to add the following grub option: = true; - - - + diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 2f76459a24e9..3ff96f719ec5 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -3,21 +3,21 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-modularity"> + Modularity -Modularity - -The NixOS configuration mechanism is modular. If your -configuration.nix becomes too big, you can split -it into multiple files. Likewise, if you have multiple NixOS -configurations (e.g. for different computers) with some commonality, -you can move the common configuration into a shared file. - -Modules have exactly the same syntax as -configuration.nix. In fact, -configuration.nix is itself a module. You can -use other modules by including them from -configuration.nix, e.g.: + + The NixOS configuration mechanism is modular. If your + configuration.nix becomes too big, you can split it into + multiple files. Likewise, if you have multiple NixOS configurations (e.g. for + different computers) with some commonality, you can move the common + configuration into a shared file. + + + Modules have exactly the same syntax as + configuration.nix. In fact, + configuration.nix is itself a module. You can use other + modules by including them from configuration.nix, e.g.: { config, pkgs, ... }: @@ -27,11 +27,9 @@ use other modules by including them from ... } - -Here, we include two modules from the same directory, -vpn.nix and kde.nix. The -latter might look like this: - + Here, we include two modules from the same directory, + vpn.nix and kde.nix. The latter + might look like this: { config, pkgs, ... }: @@ -40,59 +38,55 @@ latter might look like this: = true; } - -Note that both configuration.nix and -kde.nix define the option -. When multiple modules -define an option, NixOS will try to merge the -definitions. In the case of -, that’s easy: the lists of -packages can simply be concatenated. The value in -configuration.nix is merged last, so for -list-type options, it will appear at the end of the merged list. If -you want it to appear first, you can use mkBefore: - + Note that both configuration.nix and + kde.nix define the option + . When multiple modules + define an option, NixOS will try to merge the + definitions. In the case of , + that’s easy: the lists of packages can simply be concatenated. The value in + configuration.nix is merged last, so for list-type + options, it will appear at the end of the merged list. If you want it to + appear first, you can use mkBefore: = mkBefore [ "kvm-intel" ]; + This causes the kvm-intel kernel module to be loaded + before any other kernel modules. + -This causes the kvm-intel kernel module to be -loaded before any other kernel modules. - -For other types of options, a merge may not be possible. For -instance, if two modules define -, -nixos-rebuild will give an error: - + + For other types of options, a merge may not be possible. For instance, if two + modules define , + nixos-rebuild will give an error: The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. - -When that happens, it’s possible to force one definition take -precedence over the others: - + When that happens, it’s possible to force one definition take precedence + over the others: = pkgs.lib.mkForce "bob@example.org"; + - - -When using multiple modules, you may need to access -configuration values defined in other modules. This is what the -config function argument is for: it contains the -complete, merged system configuration. That is, -config is the result of combining the -configurations returned by every moduleIf you’re -wondering how it’s possible that the (indirect) -result of a function is passed as an -input to that same function: that’s because Nix -is a “lazy” language — it only computes values when they are needed. -This works as long as no individual configuration value depends on -itself.. For example, here is a module that adds -some packages to only if - is set to -true somewhere else: - + + When using multiple modules, you may need to access configuration values + defined in other modules. This is what the config function + argument is for: it contains the complete, merged system configuration. That + is, config is the result of combining the configurations + returned by every module + + + If you’re wondering how it’s possible that the (indirect) + result of a function is passed as an + input to that same function: that’s because Nix is a + “lazy” language — it only computes values when they are needed. This + works as long as no individual configuration value depends on itself. + + + . For example, here is a module that adds some packages to + only if + is set to + true somewhere else: { config, pkgs, ... }: @@ -105,13 +99,12 @@ some packages to only if [ ]; } + - - -With multiple modules, it may not be obvious what the final -value of a configuration option is. The command - allows you to find out: - + + With multiple modules, it may not be obvious what the final value of a + configuration option is. The command allows you + to find out: $ nixos-option true @@ -119,14 +112,11 @@ true $ nixos-option [ "tun" "ipv6" "loop" ... ] - -Interactive exploration of the configuration is possible using -nix-repl, -a read-eval-print loop for Nix expressions. It’s not installed by -default; run nix-env -i nix-repl to get it. A -typical use: - + a read-eval-print loop for Nix expressions. It’s not installed by default; + run nix-env -i nix-repl to get it. A typical use: $ nix-repl '<nixpkgs/nixos>' @@ -136,7 +126,5 @@ nix-repl> config. nix-repl> map (x: x.hostName) config. [ "example.org" "example.gov" ] - - - + diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index bbbee3a52ed5..e217a99148b9 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -3,39 +3,42 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-networkmanager"> + NetworkManager -NetworkManager - -To facilitate network configuration, some desktop environments -use NetworkManager. You can enable NetworkManager by setting: - + + To facilitate network configuration, some desktop environments use + NetworkManager. You can enable NetworkManager by setting: = true; + some desktop managers (e.g., GNOME) enable NetworkManager automatically for + you. + -some desktop managers (e.g., GNOME) enable NetworkManager -automatically for you. - -All users that should have permission to change network settings must -belong to the networkmanager group: - + + All users that should have permission to change network settings must belong + to the networkmanager group: users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; - + -NetworkManager is controlled using either nmcli or -nmtui (curses-based terminal user interface). See their -manual pages for details on their usage. Some desktop environments (GNOME, KDE) -have their own configuration tools for NetworkManager. On XFCE, there is no -configuration tool for NetworkManager by default: by adding -networkmanagerapplet to the list of system packages, the graphical -applet will be installed and will launch automatically when XFCE is starting -(and will show in the status tray). - -networking.networkmanager and -networking.wireless (WPA Supplicant) cannot be enabled at the same -time: you can still connect to the wireless networks using -NetworkManager. + + NetworkManager is controlled using either nmcli or + nmtui (curses-based terminal user interface). See their + manual pages for details on their usage. Some desktop environments (GNOME, + KDE) have their own configuration tools for NetworkManager. On XFCE, there is + no configuration tool for NetworkManager by default: by adding + networkmanagerapplet to the list of system packages, the + graphical applet will be installed and will launch automatically when XFCE is + starting (and will show in the status tray). + + + + networking.networkmanager and networking.wireless + (WPA Supplicant) cannot be enabled at the same time: you can still connect + to the wireless networks using NetworkManager. + + diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 5f08bc1f1275..02cf811e0bd3 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -3,20 +3,17 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-networking"> - -Networking - -This section describes how to configure networking components on -your NixOS machine. - - - - - - - - - + Networking + + This section describes how to configure networking components on your NixOS + machine. + + + + + + + + - diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml index 73c1722da02c..e8ac5d0681a9 100644 --- a/nixos/doc/manual/configuration/package-mgmt.xml +++ b/nixos/doc/manual/configuration/package-mgmt.xml @@ -3,32 +3,29 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-package-management"> - -Package Management - -This section describes how to add additional packages to your -system. NixOS has two distinct styles of package management: - - - - Declarative, where you declare - what packages you want in your - configuration.nix. Every time you run - nixos-rebuild, NixOS will ensure that you get a - consistent set of binaries corresponding to your - specification. - - Ad hoc, where you install, - upgrade and uninstall packages via the nix-env - command. This style allows mixing packages from different Nixpkgs - versions. It’s the only choice for non-root - users. - - - - - - - - + Package Management + + This section describes how to add additional packages to your system. NixOS + has two distinct styles of package management: + + + + Declarative, where you declare what packages you want + in your configuration.nix. Every time you run + nixos-rebuild, NixOS will ensure that you get a + consistent set of binaries corresponding to your specification. + + + + + Ad hoc, where you install, upgrade and uninstall + packages via the nix-env command. This style allows + mixing packages from different Nixpkgs versions. It’s the only choice + for non-root users. + + + + + + diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index 7dbe598cffe2..6e883e3fbbc1 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -3,30 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-ssh"> + Secure Shell Access -Secure Shell Access - -Secure shell (SSH) access to your machine can be enabled by -setting: - + + Secure shell (SSH) access to your machine can be enabled by setting: = true; + By default, root logins using a password are disallowed. They can be disabled + entirely by setting to + "no". + -By default, root logins using a password are disallowed. They can be -disabled entirely by setting - to -"no". - -You can declaratively specify authorised RSA/DSA public keys for -a user as follows: - + + You can declaratively specify authorised RSA/DSA public keys for a user as + follows: users.extraUsers.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; - - - + diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index 38032c5d9dc3..ea980254a8fc 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -3,190 +3,225 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nix-syntax-summary"> + Syntax Summary -Syntax Summary - -Below is a summary of the most important syntactic constructs in -the Nix expression language. It’s not complete. In particular, there -are many other built-in functions. See the + Below is a summary of the most important syntactic constructs in the Nix + expression language. It’s not complete. In particular, there are many other + built-in functions. See the + Nix -manual for the rest. + manual for the rest. + - + - - - - - Example - Description - - - - - - Basic values - - - "Hello world" - A string - - - "${pkgs.bash}/bin/sh" - A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") - - - true, false - Booleans - - - 123 - An integer - - - ./foo.png - A path (relative to the containing Nix expression) - - - - Compound values - - - { x = 1; y = 2; } - A set with attributes named x and y - - - { foo.bar = 1; } - A nested set, equivalent to { foo = { bar = 1; }; } - - - rec { x = "foo"; y = x + "bar"; } - A recursive set, equivalent to { x = "foo"; y = "foobar"; } - - - [ "foo" "bar" ] - A list with two elements - - - - Operators - - - "foo" + "bar" - String concatenation - - - 1 + 2 - Integer addition - - - "foo" == "f" + "oo" - Equality test (evaluates to true) - - - "foo" != "bar" - Inequality test (evaluates to true) - - - !true - Boolean negation - - - { x = 1; y = 2; }.x - Attribute selection (evaluates to 1) - - - { x = 1; y = 2; }.z or 3 - Attribute selection with default (evaluates to 3) - - - { x = 1; y = 2; } // { z = 3; } - Merge two sets (attributes in the right-hand set taking precedence) - - - - Control structures - - - if 1 + 1 == 2 then "yes!" else "no!" - Conditional expression - - - assert 1 + 1 == 2; "yes!" - Assertion check (evaluates to "yes!"). See + + + + Example + Description + + + + + Basic values + + + + "Hello world" + + A string + + + "${pkgs.bash}/bin/sh" + + A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") + + + true, false + + Booleans + + + 123 + + An integer + + + ./foo.png + + A path (relative to the containing Nix expression) + + + Compound values + + + + { x = 1; y = 2; } + + A set with attributes named x and y + + + + { foo.bar = 1; } + + A nested set, equivalent to { foo = { bar = 1; }; } + + + + rec { x = "foo"; y = x + "bar"; } + + A recursive set, equivalent to { x = "foo"; y = "foobar"; } + + + + [ "foo" "bar" ] + + A list with two elements + + + Operators + + + + "foo" + "bar" + + String concatenation + + + 1 + 2 + + Integer addition + + + "foo" == "f" + "oo" + + Equality test (evaluates to true) + + + "foo" != "bar" + + Inequality test (evaluates to true) + + + !true + + Boolean negation + + + { x = 1; y = 2; }.x + + Attribute selection (evaluates to 1) + + + { x = 1; y = 2; }.z or 3 + + Attribute selection with default (evaluates to 3) + + + { x = 1; y = 2; } // { z = 3; } + + Merge two sets (attributes in the right-hand set taking precedence) + + + Control structures + + + + if 1 + 1 == 2 then "yes!" else "no!" + + Conditional expression + + + assert 1 + 1 == 2; "yes!" + + Assertion check (evaluates to "yes!"). See for using assertions in modules - - - let x = "foo"; y = "bar"; in x + y - Variable definition - - - with pkgs.lib; head [ 1 2 3 ] - Add all attributes from the given set to the scope + + + let x = "foo"; y = "bar"; in x + y + + Variable definition + + + with pkgs.lib; head [ 1 2 3 ] + + Add all attributes from the given set to the scope (evaluates to 1) - - - - Functions (lambdas) - - - x: x + 1 - A function that expects an integer and returns it increased by 1 - - - (x: x + 1) 100 - A function call (evaluates to 101) - - - let inc = x: x + 1; in inc (inc (inc 100)) - A function bound to a variable and subsequently called by name (evaluates to 103) - - - { x, y }: x + y - A function that expects a set with required attributes + + + Functions (lambdas) + + + + x: x + 1 + + A function that expects an integer and returns it increased by 1 + + + (x: x + 1) 100 + + A function call (evaluates to 101) + + + let inc = x: x + 1; in inc (inc (inc 100)) + + A function bound to a variable and subsequently called by name (evaluates to 103) + + + { x, y }: x + y + + A function that expects a set with required attributes x and y and concatenates them - - - { x, y ? "bar" }: x + y - A function that expects a set with required attribute + + + { x, y ? "bar" }: x + y + + A function that expects a set with required attribute x and optional y, using "bar" as default value for - y - - - { x, y, ... }: x + y - A function that expects a set with required attributes + y + + + + { x, y, ... }: x + y + + A function that expects a set with required attributes x and y and ignores any other attributes - - - { x, y } @ args: x + y - A function that expects a set with required attributes + + + { x, y } @ args: x + y + + A function that expects a set with required attributes x and y, and binds the - whole set to args - - - - Built-in functions - - - import ./foo.nix - Load and return Nix expression in given file - - - map (x: x + x) [ 1 2 3 ] - Apply a function to every element of a list (evaluates to [ 2 4 6 ]) - - - - + - - + diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 1456a5894119..66c1c6eb3a11 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -3,14 +3,12 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-user-management"> - -User Management - -NixOS supports both declarative and imperative styles of user -management. In the declarative style, users are specified in -configuration.nix. For instance, the following -states that a user account named alice shall exist: - + User Management + + NixOS supports both declarative and imperative styles of user management. In + the declarative style, users are specified in + configuration.nix. For instance, the following states + that a user account named alice shall exist: .alice = { isNormalUser = true; @@ -20,81 +18,71 @@ states that a user account named alice shall exist: openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; - -Note that alice is a member of the -wheel and networkmanager groups, -which allows her to use sudo to execute commands as -root and to configure the network, respectively. -Also note the SSH public key that allows remote logins with the -corresponding private key. Users created in this way do not have a -password by default, so they cannot log in via mechanisms that require -a password. However, you can use the passwd program -to set a password, which is retained across invocations of -nixos-rebuild. - -If you set to false, then the contents of -/etc/passwd and /etc/group will be congruent to -your NixOS configuration. For instance, if you remove a user from -and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users -and groups, such as useradd, are no longer available. Passwords may still be -assigned by setting the user's hashedPassword -option. A hashed password can be generated using mkpasswd -m sha-512 -after installing the mkpasswd package. - -A user ID (uid) is assigned automatically. You can also specify -a uid manually by adding - + Note that alice is a member of the + wheel and networkmanager groups, which + allows her to use sudo to execute commands as + root and to configure the network, respectively. Also note + the SSH public key that allows remote logins with the corresponding private + key. Users created in this way do not have a password by default, so they + cannot log in via mechanisms that require a password. However, you can use + the passwd program to set a password, which is retained + across invocations of nixos-rebuild. + + + If you set to false, then the + contents of /etc/passwd and /etc/group + will be congruent to your NixOS configuration. For instance, if you remove a + user from and run nixos-rebuild, the user + account will cease to exist. Also, imperative commands for managing users and + groups, such as useradd, are no longer available. Passwords may still be + assigned by setting the user's + hashedPassword + option. A hashed password can be generated using mkpasswd -m + sha-512 after installing the mkpasswd package. + + + A user ID (uid) is assigned automatically. You can also specify a uid + manually by adding uid = 1000; - -to the user specification. - -Groups can be specified similarly. The following states that a -group named students shall exist: - + to the user specification. + + + Groups can be specified similarly. The following states that a group named + students shall exist: .students.gid = 1000; - -As with users, the group ID (gid) is optional and will be assigned -automatically if it’s missing. - -In the imperative style, users and groups are managed by -commands such as useradd, -groupmod and so on. For instance, to create a user -account named alice: - + As with users, the group ID (gid) is optional and will be assigned + automatically if it’s missing. + + + In the imperative style, users and groups are managed by commands such as + useradd, groupmod and so on. For + instance, to create a user account named alice: # useradd -m alice - -To make all nix tools available to this new user use `su - USER` which -opens a login shell (==shell that loads the profile) for given user. -This will create the ~/.nix-defexpr symlink. So run: - + To make all nix tools available to this new user use `su - USER` which opens + a login shell (==shell that loads the profile) for given user. This will + create the ~/.nix-defexpr symlink. So run: # su - alice -c "true" - - -The flag causes the creation of a home directory -for the new user, which is generally what you want. The user does not -have an initial password and therefore cannot log in. A password can -be set using the passwd utility: - + The flag causes the creation of a home directory for the + new user, which is generally what you want. The user does not have an initial + password and therefore cannot log in. A password can be set using the + passwd utility: # passwd alice Enter new UNIX password: *** Retype new UNIX password: *** - -A user can be deleted using userdel: - + A user can be deleted using userdel: # userdel -r alice - -The flag deletes the user’s home directory. -Accounts can be modified using usermod. Unix -groups can be managed using groupadd, -groupmod and groupdel. - + The flag deletes the user’s home directory. Accounts + can be modified using usermod. Unix groups can be managed + using groupadd, groupmod and + groupdel. + diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 6ce43a437009..999447234ad1 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -3,22 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-wireless"> + Wireless Networks -Wireless Networks - -For a desktop installation using NetworkManager (e.g., GNOME), -you just have to make sure the user is in the -networkmanager group and you can skip the rest of this -section on wireless networks. - - -NixOS will start wpa_supplicant for you if you enable this setting: + + For a desktop installation using NetworkManager (e.g., GNOME), you just have + to make sure the user is in the networkmanager group and you can + skip the rest of this section on wireless networks. + + + NixOS will start wpa_supplicant for you if you enable this setting: = true; - -NixOS lets you specify networks for wpa_supplicant declaratively: + NixOS lets you specify networks for wpa_supplicant declaratively: = { echelon = { @@ -27,27 +25,21 @@ NixOS lets you specify networks for wpa_supplicant declaratively: "free.wifi" = {}; } + Be aware that keys will be written to the nix store in plaintext! When no + networks are set, it will default to using a configuration file at + /etc/wpa_supplicant.conf. You should edit this file + yourself to define wireless networks, WPA keys and so on (see + wpa_supplicant.conf(5)). + -Be aware that keys will be written to the nix store in plaintext! - -When no networks are set, it will default to using a configuration file at -/etc/wpa_supplicant.conf. You should edit this file -yourself to define wireless networks, WPA keys and so on (see -wpa_supplicant.conf(5)). - - - -If you are using WPA2 the wpa_passphrase tool might be useful -to generate the wpa_supplicant.conf. - + + If you are using WPA2 the wpa_passphrase tool might be + useful to generate the wpa_supplicant.conf. # wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf - -After you have edited the wpa_supplicant.conf, -you need to restart the wpa_supplicant service. - + After you have edited the wpa_supplicant.conf, you need to + restart the wpa_supplicant service. # systemctl restart wpa_supplicant.service - - + diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index fd0daf6c6e57..9a0969ad6355 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -3,27 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-x11"> - -X Window System - -The X Window System (X11) provides the basis of NixOS’ graphical -user interface. It can be enabled as follows: + X Window System + + The X Window System (X11) provides the basis of NixOS’ graphical user + interface. It can be enabled as follows: = true; -The X server will automatically detect and use the appropriate video -driver from a set of X.org drivers (such as vesa -and intel). You can also specify a driver -manually, e.g. + The X server will automatically detect and use the appropriate video driver + from a set of X.org drivers (such as vesa and + intel). You can also specify a driver manually, e.g. = [ "r128" ]; -to enable X.org’s xf86-video-r128 driver. - -You also need to enable at least one desktop or window manager. -Otherwise, you can only log into a plain undecorated -xterm window. Thus you should pick one or more of -the following lines: + to enable X.org’s xf86-video-r128 driver. + + + You also need to enable at least one desktop or window manager. Otherwise, + you can only log into a plain undecorated xterm window. + Thus you should pick one or more of the following lines: = true; = true; @@ -33,108 +31,105 @@ the following lines: = true; = true; - - -NixOS’s default display manager (the -program that provides a graphical login prompt and manages the X -server) is SLiM. You can select an alternative one by picking one -of the following lines: + + + NixOS’s default display manager (the program that + provides a graphical login prompt and manages the X server) is SLiM. You can + select an alternative one by picking one of the following lines: = true; = true; - - -You can set the keyboard layout (and optionally the layout variant): + + + You can set the keyboard layout (and optionally the layout variant): = "de"; = "neo"; - - -The X server is started automatically at boot time. If you -don’t want this to happen, you can set: + + + The X server is started automatically at boot time. If you don’t want this + to happen, you can set: = false; -The X server can then be started manually: + The X server can then be started manually: # systemctl start display-manager.service - - - -NVIDIA Graphics Cards - -NVIDIA provides a proprietary driver for its graphics cards that -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: + + + NVIDIA Graphics Cards + + NVIDIA provides a proprietary driver for its graphics cards that 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: = [ "nvidia" ]; -Or if you have an older card, you may have to use one of the legacy drivers: + Or if you have an older card, you may have to use one of the legacy drivers: = [ "nvidiaLegacy340" ]; = [ "nvidiaLegacy304" ]; = [ "nvidiaLegacy173" ]; -You may need to reboot after enabling this driver to prevent a clash -with other kernel modules. - -On 64-bit systems, if you want full acceleration for 32-bit -programs such as Wine, you should also set the following: + You may need to reboot after enabling this driver to prevent a clash with + other kernel modules. + + + On 64-bit systems, if you want full acceleration for 32-bit programs such as + Wine, you should also set the following: = true; - - - - -AMD Graphics Cards - -AMD provides a proprietary driver for its graphics cards that -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: + + + + AMD Graphics Cards + + AMD provides a proprietary driver for its graphics cards that 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: = [ "ati_unfree" ]; -You will need to reboot after enabling this driver to prevent a clash -with other kernel modules. - -On 64-bit systems, if you want full acceleration for 32-bit -programs such as Wine, you should also set the following: + You will need to reboot after enabling this driver to prevent a clash with + other kernel modules. + + + On 64-bit systems, if you want full acceleration for 32-bit programs such as + Wine, you should also set the following: = true; - - - - -Touchpads - -Support for Synaptics touchpads (found in many laptops such as -the Dell Latitude series) can be enabled as follows: + + + + Touchpads + + Support for Synaptics touchpads (found in many laptops such as the Dell + Latitude series) can be enabled as follows: = true; -The driver has many options (see ). For -instance, the following disables tap-to-click behavior: + The driver has many options (see ). For + instance, the following disables tap-to-click behavior: = false; -Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. - - - - -GTK/Qt themes - -GTK themes can be installed either to user profile or system-wide (via -environment.systemPackages). To make Qt 5 applications look similar -to GTK2 ones, you can install qt5.qtbase.gtk package into your -system environment. It should work for all Qt 5 library versions. - - - - + Note: the use of services.xserver.synaptics is deprecated + since NixOS 17.09. + + + + GTK/Qt themes + + GTK themes can be installed either to user profile or system-wide (via + environment.systemPackages). To make Qt 5 applications + look similar to GTK2 ones, you can install qt5.qtbase.gtk + package into your system environment. It should work for all Qt 5 library + versions. + + diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 8cb592faed53..40e61d2bd691 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -3,23 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-xfce"> - - Xfce Desktop Environment - - - To enable the Xfce Desktop Environment, set - + Xfce Desktop Environment + + To enable the Xfce Desktop Environment, set + services.xserver.desktopManager = { xfce.enable = true; default = "xfce"; }; - - - - Optionally, compton - can be enabled for nice graphical effects, some example settings: - + + + Optionally, compton can be enabled for nice graphical + effects, some example settings: + services.compton = { enable = true; fade = true; @@ -28,67 +25,48 @@ fadeDelta = 4; }; - - - - Some Xfce programs are not installed automatically. - To install them manually (system wide), put them into your - . - - - - Thunar Volume Support - - - To enable - Thunar - volume support, put - + + + Some Xfce programs are not installed automatically. To install them manually + (system wide), put them into your + . + + + Thunar Volume Support + + To enable Thunar volume support, put + = true; - into your configuration.nix. - - - - - - Polkit Authentication Agent - - - There is no authentication agent automatically installed alongside - Xfce. To allow mounting of local (non-removable) filesystems, you - will need to install one. - - Installing polkit_gnome, a rebuild, logout and - login did the trick. - - - - - - Troubleshooting - - - Even after enabling udisks2, volume management might not work. - Thunar and/or the desktop takes time to show up. - - Thunar will spit out this kind of message on start - (look at journalctl --user -b). - - + into your configuration.nix. + + + + Polkit Authentication Agent + + There is no authentication agent automatically installed alongside Xfce. To + allow mounting of local (non-removable) filesystems, you will need to + install one. Installing polkit_gnome, a rebuild, logout + and login did the trick. + + + + Troubleshooting + + Even after enabling udisks2, volume management might not work. Thunar and/or + the desktop takes time to show up. Thunar will spit out this kind of message + on start (look at journalctl --user -b). + Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported - - This is caused by some needed GNOME services not running. - This is all fixed by enabling "Launch GNOME services on startup" in - the Advanced tab of the Session and Startup settings panel. - Alternatively, you can run this command to do the same thing. - + This is caused by some needed GNOME services not running. This is all fixed + by enabling "Launch GNOME services on startup" in the Advanced tab of the + Session and Startup settings panel. Alternatively, you can run this command + to do the same thing. + $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true - A log-out and re-log will be needed for this to take effect. - - - - + A log-out and re-log will be needed for this to take effect. + + diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml index d3434e1f112e..17c38ffcc717 100644 --- a/nixos/doc/manual/development/assertions.xml +++ b/nixos/doc/manual/development/assertions.xml @@ -3,30 +3,29 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-assertions"> + Warnings and Assertions -Warnings and Assertions + + When configuration problems are detectable in a module, it is a good idea to + write an assertion or warning. Doing so provides clear feedback to the user + and prevents errors after the build. + - - When configuration problems are detectable in a module, it is a good - idea to write an assertion or warning. Doing so provides clear - feedback to the user and prevents errors after the build. - - - + Although Nix has the abort and - builtins.trace functions to perform such tasks, - they are not ideally suited for NixOS modules. Instead of these - functions, you can declare your warnings and assertions using the + builtins.trace + functions + to perform such tasks, they are not ideally suited for NixOS modules. Instead + of these functions, you can declare your warnings and assertions using the NixOS module system. - + -
+
+ Warnings -Warnings - - - This is an example of using warnings. - + + This is an example of using warnings. + +
-
+
+ Assertions -
- -Assertions - - - - This example, extracted from the - - syslogd module - shows how to use assertions. Since there - can only be one active syslog daemon at a time, an assertion is useful to - prevent such a broken system from being built. - + + This example, extracted from the + + syslogd module shows how to use + assertions. Since there can only be one active syslog + daemon at a time, an assertion is useful to prevent such a broken system + from being built. + - -
- +
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index 2f963f8666f1..23d9ddf88a77 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -3,30 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-building-cd"> - -Building Your Own NixOS CD - -Building a NixOS CD is as easy as configuring your own computer. The -idea is to use another module which will replace -your configuration.nix to configure the system that -would be installed on the CD. - -Default CD/DVD configurations are available -inside nixos/modules/installer/cd-dvd. - + Building Your Own NixOS CD + + Building a NixOS CD is as easy as configuring your own computer. The idea is + to use another module which will replace your + configuration.nix to configure the system that would be + installed on the CD. + + + Default CD/DVD configurations are available inside + nixos/modules/installer/cd-dvd. $ git clone https://github.com/NixOS/nixpkgs.git $ cd nixpkgs/nixos $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix - - - -Before burning your CD/DVD, you can check the content of the image by mounting anywhere like -suggested by the following command: - + + + Before burning your CD/DVD, you can check the content of the image by + mounting anywhere like suggested by the following command: # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso - - - + diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml index 09a40114f02e..031048aaa377 100644 --- a/nixos/doc/manual/development/building-parts.xml +++ b/nixos/doc/manual/development/building-parts.xml @@ -3,111 +3,110 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-building-parts"> - -Building Specific Parts of NixOS - -With the command nix-build, you can build -specific parts of your NixOS configuration. This is done as follows: - + Building Specific Parts of NixOS + + With the command nix-build, you can build specific parts + of your NixOS configuration. This is done as follows: $ cd /path/to/nixpkgs/nixos $ nix-build -A config.option - -where option is a NixOS option with type -“derivation” (i.e. something that can be built). Attributes of -interest include: - - - - - system.build.toplevel + where option is a NixOS option with type + “derivation” (i.e. something that can be built). Attributes of interest + include: + + + system.build.toplevel + - The top-level option that builds the entire NixOS system. - Everything else in your configuration is indirectly pulled in by - this option. This is what nixos-rebuild - builds and what /run/current-system points - to afterwards. - - A shortcut to build this is: - + + The top-level option that builds the entire NixOS system. Everything else + in your configuration is indirectly pulled in by this option. This is + what nixos-rebuild builds and what + /run/current-system points to afterwards. + + + A shortcut to build this is: $ nix-build -A system - + - - - - system.build.manual.manual - The NixOS manual. - - - - system.build.etc - A tree of symlinks that form the static parts of - /etc. - - - - system.build.initialRamdisk - system.build.kernel + + + system.build.manual.manual + - The initial ramdisk and kernel of the system. This allows - a quick way to test whether the kernel and the initial ramdisk - boot correctly, by using QEMU’s and - options: - + + The NixOS manual. + + + + + system.build.etc + + + + A tree of symlinks that form the static parts of + /etc. + + + + + system.build.initialRamdisk + + system.build.kernel + + + + The initial ramdisk and kernel of the system. This allows a quick way to + test whether the kernel and the initial ramdisk boot correctly, by using + QEMU’s and options: $ nix-build -A config.system.build.initialRamdisk -o initrd $ nix-build -A config.system.build.kernel -o kernel $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null - - + - - - - system.build.nixos-rebuild - system.build.nixos-install - system.build.nixos-generate-config + + + system.build.nixos-rebuild + + system.build.nixos-install + + system.build.nixos-generate-config + - These build the corresponding NixOS commands. + + These build the corresponding NixOS commands. + - - - - systemd.units.unit-name.unit + + + systemd.units.unit-name.unit + - This builds the unit with the specified name. Note that - since unit names contain dots - (e.g. httpd.service), you need to put them - between quotes, like this: - + + This builds the unit with the specified name. Note that since unit names + contain dots (e.g. httpd.service), you need to put + them between quotes, like this: $ nix-build -A 'config.systemd.units."httpd.service".unit' - - You can also test individual units, without rebuilding the whole - system, by putting them in - /run/systemd/system: - + You can also test individual units, without rebuilding the whole system, + by putting them in /run/systemd/system: $ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ /run/systemd/system/tmp-httpd.service # systemctl daemon-reload # systemctl start tmp-httpd.service - Note that the unit must not have the same name as any unit in - /etc/systemd/system since those take - precedence over /run/systemd/system. - That’s why the unit is installed as - tmp-httpd.service here. + /etc/systemd/system since those take precedence over + /run/systemd/system. That’s why the unit is + installed as tmp-httpd.service here. + - - - - - - + + + diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 47343d93cde9..03dee6ff09bb 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -3,21 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-development"> - -Development - - -This chapter describes how you can modify and extend -NixOS. - - - - - - - - - - - + Development + + + This chapter describes how you can modify and extend NixOS. + + + + + + + + + + diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml index ec1da09b9507..1c6a5671eda8 100644 --- a/nixos/doc/manual/development/importing-modules.xml +++ b/nixos/doc/manual/development/importing-modules.xml @@ -3,13 +3,12 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-importing-modules"> + Importing Modules -Importing Modules - - - Sometimes NixOS modules need to be used in configuration but exist - outside of Nixpkgs. These modules can be imported: - + + Sometimes NixOS modules need to be used in configuration but exist outside of + Nixpkgs. These modules can be imported: + { config, lib, pkgs, ... }: @@ -25,12 +24,11 @@ } - - The environment variable NIXOS_EXTRA_MODULE_PATH is - an absolute path to a NixOS module that is included alongside the - Nixpkgs NixOS modules. Like any NixOS module, this module can import - additional modules: - + + The environment variable NIXOS_EXTRA_MODULE_PATH is an + absolute path to a NixOS module that is included alongside the Nixpkgs NixOS + modules. Like any NixOS module, this module can import additional modules: + # ./module-list/default.nix @@ -55,5 +53,4 @@ services.exampleModule1.enable = true; } - diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml index de0870314dcb..3d019a4987e1 100644 --- a/nixos/doc/manual/development/meta-attributes.xml +++ b/nixos/doc/manual/development/meta-attributes.xml @@ -3,22 +3,26 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-meta-attributes"> + Meta Attributes -Meta Attributes - -Like Nix packages, NixOS modules can declare meta-attributes to provide - extra information. Module meta attributes are defined in the + + Like Nix packages, NixOS modules can declare meta-attributes to provide extra + information. Module meta attributes are defined in the meta.nix - special module. + special module. + -meta is a top level attribute like + + meta is a top level attribute like options and config. Available meta-attributes are maintainers and - doc. + doc. + -Each of the meta-attributes must be defined at most once per module - file. + + Each of the meta-attributes must be defined at most once per module file. + { config, lib, pkgs, ... }: @@ -39,24 +43,21 @@ } - - - + + + maintainers contains a list of the module maintainers. - - - - - + + + + doc points to a valid DocBook file containing the module - documentation. Its contents is automatically added to . - Changes to a module documentation have to be checked to not break - building the NixOS manual: - - $ nix-build nixos/release.nix -A manual - - - - + documentation. Its contents is automatically added to + . Changes to a module documentation + have to be checked to not break building the NixOS manual: + +$ nix-build nixos/release.nix -A manual + + diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index c09c41ea3bdc..2695082e3867 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -3,18 +3,17 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-nixos-tests"> - -NixOS Tests - -When you add some feature to NixOS, you should write a test for -it. NixOS tests are kept in the directory NixOS Tests + + When you add some feature to NixOS, you should write a test for it. NixOS + tests are kept in the directory + nixos/tests, -and are executed (using Nix) by a testing framework that automatically -starts one or more virtual machines containing the NixOS system(s) -required for the test. - - - - - + and are executed (using Nix) by a testing framework that automatically starts + one or more virtual machines containing the NixOS system(s) required for the + test. + + + + diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index ed718c89eb77..a8f528a0a804 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -3,14 +3,12 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-option-declarations"> + Option Declarations -Option Declarations - -An option declaration specifies the name, type and description -of a NixOS configuration option. It is invalid to define an option -that hasn’t been declared in any module. An option declaration -generally looks like this: - + + An option declaration specifies the name, type and description of a NixOS + configuration option. It is invalid to define an option that hasn’t been + declared in any module. An option declaration generally looks like this: options = { name = mkOption { @@ -21,146 +19,177 @@ options = { }; }; - -The attribute names within the name -attribute path must be camel cased in general but should, as an -exception, match the -name attribute path + must be camel cased in general but should, as an exception, match the + -package attribute name when referencing a Nixpkgs package. For -example, the option services.nix-serve.bindAddress -references the nix-serve Nixpkgs package. + package attribute name when referencing a Nixpkgs package. For + example, the option services.nix-serve.bindAddress + references the nix-serve Nixpkgs package. + - - -The function mkOption accepts the following arguments. - - - - - type + + The function mkOption accepts the following arguments. + + + type + - The type of the option (see ). - It may be omitted, but that’s not advisable since it may lead to errors - that are hard to diagnose. + + The type of the option (see ). It may + be omitted, but that’s not advisable since it may lead to errors that + are hard to diagnose. + - - - - default + + + default + - The default value used if no value is defined by any - module. A default is not required; but if a default is not given, - then users of the module will have to define the value of the - option, otherwise an error will be thrown. + + The default value used if no value is defined by any module. A default is + not required; but if a default is not given, then users of the module + will have to define the value of the option, otherwise an error will be + thrown. + - - - - example + + + example + - An example value that will be shown in the NixOS manual. + + An example value that will be shown in the NixOS manual. + - - - - description + + + description + - A textual description of the option, in DocBook format, - that will be included in the NixOS manual. + + A textual description of the option, in DocBook format, that will be + included in the NixOS manual. + - + + + - +
+ Extensible Option Types - - -
Extensible Option - Types - - Extensible option types is a feature that allow to extend certain types - declaration through multiple module files. - This feature only work with a restricted set of types, namely - enum and submodules and any composed - forms of them. - - Extensible option types can be used for enum options - that affects multiple modules, or as an alternative to related - enable options. - - As an example, we will take the case of display managers. There is a - central display manager module for generic display manager options and a - module file per display manager backend (slim, sddm, gdm ...). + + Extensible option types is a feature that allow to extend certain types + declaration through multiple module files. This feature only work with a + restricted set of types, namely enum and + submodules and any composed forms of them. - There are two approach to this module structure: - - - Managing the display managers independently by adding an - enable option to every display manager module backend. (NixOS) - - Managing the display managers in the central module by - adding an option to select which display manager backend to use. - - + + Extensible option types can be used for enum options that + affects multiple modules, or as an alternative to related + enable options. - Both approaches have problems. + + As an example, we will take the case of display managers. There is a central + display manager module for generic display manager options and a module file + per display manager backend (slim, sddm, gdm ...). + - Making backends independent can quickly become hard to manage. For - display managers, there can be only one enabled at a time, but the type - system can not enforce this restriction as there is no relation between - each backend enable option. As a result, this restriction - has to be done explicitely by adding assertions in each display manager - backend module. + + There are two approach to this module structure: + + + + Managing the display managers independently by adding an enable option to + every display manager module backend. (NixOS) + + + + + Managing the display managers in the central module by adding an option + to select which display manager backend to use. + + + + - On the other hand, managing the display managers backends in the - central module will require to change the central module option every time - a new backend is added or removed. + + Both approaches have problems. + - By using extensible option types, it is possible to create a placeholder - option in the central module (), and to extend it in each backend module (, ). + + Making backends independent can quickly become hard to manage. For display + managers, there can be only one enabled at a time, but the type system can + not enforce this restriction as there is no relation between each backend + enable option. As a result, this restriction has to be + done explicitely by adding assertions in each display manager backend + module. + - As a result, displayManager.enable option values can - be added without changing the main service module file and the type system - automatically enforce that there can only be a single display manager - enabled. + + On the other hand, managing the display managers backends in the central + module will require to change the central module option every time a new + backend is added or removed. + -Extensible type - placeholder in the service module + + By using extensible option types, it is possible to create a placeholder + option in the central module + (), and to extend + it in each backend module + (, + ). + + + + As a result, displayManager.enable option values can be + added without changing the main service module file and the type system + automatically enforce that there can only be a single display manager + enabled. + + + + Extensible type placeholder in the service module services.xserver.displayManager.enable = mkOption { description = "Display manager to use"; type = with types; nullOr (enum [ ]); -}; +}; + -Extending - <literal>services.xserver.displayManager.enable</literal> in the - <literal>slim</literal> module + + Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); -}; +}; + -Extending - <literal>services.xserver.displayManager.enable</literal> in the - <literal>sddm</literal> module + + Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>sddm</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); -}; +}; + -The placeholder declaration is a standard mkOption - declaration, but it is important that extensible option declarations only use - the type argument. - -Extensible option types work with any of the composed variants of - enum such as - with types; nullOr (enum [ "foo" "bar" ]) - or with types; listOf (enum [ "foo" "bar" ]). + + The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only + use the type argument. + -
+ + Extensible option types work with any of the composed variants of + enum such as with types; nullOr (enum [ "foo" + "bar" ]) or with types; listOf (enum [ "foo" "bar" + ]). + +
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml index 4e267ecfd1e3..580a5afd58cd 100644 --- a/nixos/doc/manual/development/option-def.xml +++ b/nixos/doc/manual/development/option-def.xml @@ -3,39 +3,36 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-option-definitions"> + Option Definitions -Option Definitions - -Option definitions are generally straight-forward bindings of values to option names, like - + + Option definitions are generally straight-forward bindings of values to + option names, like config = { services.httpd.enable = true; }; + However, sometimes you need to wrap an option definition or set of option + definitions in a property to achieve certain effects: + -However, sometimes you need to wrap an option definition or set of -option definitions in a property to achieve -certain effects: - -Delaying Conditionals - -If a set of option definitions is conditional on the value of -another option, you may need to use mkIf. -Consider, for instance: - + + Delaying Conditionals + + If a set of option definitions is conditional on the value of another + option, you may need to use mkIf. Consider, for instance: config = if config.services.httpd.enable then { environment.systemPackages = [ ... ]; ... } else {}; - -This definition will cause Nix to fail with an “infinite recursion” -error. Why? Because the value of - depends on the value -being constructed here. After all, you could also write the clearly -circular and contradictory: + This definition will cause Nix to fail with an “infinite recursion” + error. Why? Because the value of + depends on the value being + constructed here. After all, you could also write the clearly circular and + contradictory: config = if config.services.httpd.enable then { services.httpd.enable = false; @@ -43,56 +40,49 @@ config = if config.services.httpd.enable then { services.httpd.enable = true; }; - -The solution is to write: - + The solution is to write: config = mkIf config.services.httpd.enable { environment.systemPackages = [ ... ]; ... }; - -The special function mkIf causes the evaluation of -the conditional to be “pushed down” into the individual definitions, -as if you had written: - + The special function mkIf causes the evaluation of the + conditional to be “pushed down” into the individual definitions, as if + you had written: config = { environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; ... }; + + - - - - -Setting Priorities - -A module can override the definitions of an option in other -modules by setting a priority. All option -definitions that do not have the lowest priority value are discarded. -By default, option definitions have priority 1000. You can specify an -explicit priority by using mkOverride, e.g. - + + Setting Priorities + + A module can override the definitions of an option in other modules by + setting a priority. All option definitions that do not + have the lowest priority value are discarded. By default, option definitions + have priority 1000. You can specify an explicit priority by using + mkOverride, e.g. services.openssh.enable = mkOverride 10 false; + This definition causes all other definitions with priorities above 10 to be + discarded. The function mkForce is equal to + mkOverride 50. + + -This definition causes all other definitions with priorities above 10 -to be discarded. The function mkForce is -equal to mkOverride 50. - - - -Merging Configurations - -In conjunction with mkIf, it is sometimes -useful for a module to return multiple sets of option definitions, to -be merged together as if they were declared in separate modules. This -can be done using mkMerge: - + + Merging Configurations + + In conjunction with mkIf, it is sometimes useful for a + module to return multiple sets of option definitions, to be merged together + as if they were declared in separate modules. This can be done using + mkMerge: config = mkMerge [ # Unconditional stuff. @@ -104,9 +94,6 @@ config = mkMerge }) ]; - - - - - - \ No newline at end of file + + + diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 13fa8d1e114c..7969d8124738 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -3,241 +3,346 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-option-types"> + Options Types -Options Types + + Option types are a way to put constraints on the values a module option can + take. Types are also responsible of how values are merged in case of multiple + value definitions. + - Option types are a way to put constraints on the values a module option - can take. - Types are also responsible of how values are merged in case of multiple - value definitions. -
Basic Types +
+ Basic Types - Basic types are the simplest available types in the module system. - Basic types include multiple string types that mainly differ in how - definition merging is handled. + + Basic types are the simplest available types in the module system. Basic + types include multiple string types that mainly differ in how definition + merging is handled. + - - - types.bool - A boolean, its values can be true or - false. - - - types.path - A filesystem path, defined as anything that when coerced to - a string starts with a slash. Even if derivations can be considered as - path, the more specific types.package should be - preferred. - - - types.package - A derivation or a store path. - - - -Integer-related types: - - - - types.int - A signed integer. - - - - types.ints.{s8, s16, s32} + + + types.bool - Signed integers with a fixed length (8, 16 or 32 bits). - They go from - −2n/2 - to - 2n/2−1 - - respectively (e.g. −128 to 127 - for 8 bits). - - - - - types.ints.unsigned - - An unsigned integer (that is >= 0). - - - - - types.ints.{u8, u16, u32} + + A boolean, its values can be true or + false. + + + + + types.path - Unsigned integers with a fixed length (8, 16 or 32 bits). - They go from - 0 to - 2n−1 - - respectively (e.g. 0 to 255 - for 8 bits). - - - - - types.ints.positive + + A filesystem path, defined as anything that when coerced to a string + starts with a slash. Even if derivations can be considered as path, the + more specific types.package should be preferred. + + + + + types.package - A positive integer (that is > 0). - - - + + + A derivation or a store path. + + + + -String-related types: + + Integer-related types: + - - - types.str - A string. Multiple definitions cannot be - merged. - - - types.lines - A string. Multiple definitions are concatenated with a new - line "\n". - - - types.commas - A string. Multiple definitions are concatenated with a comma - ",". - - - types.envVar - A string. Multiple definitions are concatenated with a - collon ":". - - - types.strMatching - A string matching a specific regular expression. Multiple - definitions cannot be merged. The regular expression is processed using - builtins.match. - - + + + types.int + + + + A signed integer. + + + + + types.ints.{s8, s16, s32} + + + + Signed integers with a fixed length (8, 16 or 32 bits). They go from + −2n/2 + to + 2n/2−1 + respectively (e.g. −128 to + 127 for 8 bits). + + + + + types.ints.unsigned + + + + An unsigned integer (that is >= 0). + + + + + types.ints.{u8, u16, u32} + + + + Unsigned integers with a fixed length (8, 16 or 32 bits). They go from + 0 to + + 2n−1 + respectively (e.g. 0 to + 255 for 8 bits). + + + + + types.ints.positive + + + + A positive integer (that is > 0). + + + + + + String-related types: + + + + + types.str + + + + A string. Multiple definitions cannot be merged. + + + + + types.lines + + + + A string. Multiple definitions are concatenated with a new line + "\n". + + + + + types.commas + + + + A string. Multiple definitions are concatenated with a comma + ",". + + + + + types.envVar + + + + A string. Multiple definitions are concatenated with a collon + ":". + + + + + types.strMatching + + + + A string matching a specific regular expression. Multiple definitions + cannot be merged. The regular expression is processed using + builtins.match. + + + +
-
Value Types +
+ Value Types - Value types are types that take a value parameter. + + Value types are types that take a value parameter. + - - - types.enum l - One element of the list l, e.g. - types.enum [ "left" "right" ]. Multiple definitions - cannot be merged. - - - types.separatedString - sep - A string with a custom separator - sep, e.g. types.separatedString - "|". - - - - types.ints.between - lowest - highest + + + types.enuml - An integer between lowest - and highest (both inclusive). - Useful for creating types like types.port. - - - - types.submodule o - A set of sub options o. - o can be an attribute set or a function - returning an attribute set. Submodules are used in composed types to - create modular options. Submodule are detailed in . - - + + + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged. + + + + + types.separatedStringsep + + + + A string with a custom separator sep, e.g. + types.separatedString "|". + + + + + types.ints.betweenlowesthighest + + + + An integer between lowest and + highest (both inclusive). Useful for creating + types like types.port. + + + + + types.submoduleo + + + + A set of sub options o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in + . + + + +
-
Composed Types +
+ Composed Types - Composed types are types that take a type as parameter. listOf - int and either int str are examples of - composed types. + + Composed types are types that take a type as parameter. listOf + int and either int str are examples of composed + types. + - - - types.listOf t - A list of t type, e.g. - types.listOf int. Multiple definitions are merged - with list concatenation. - - - types.attrsOf t - An attribute set of where all the values are of - t type. Multiple definitions result in the - joined attribute set. - - - types.loaOf t - An attribute set or a list of t - type. Multiple definitions are merged according to the - value. - - - types.nullOr t - null or type - t. Multiple definitions are merged according - to type t. - - - types.uniq t - Ensures that type t cannot be - merged. It is used to ensure option definitions are declared only - once. - - - types.either t1 - t2 - Type t1 or type - t2, e.g. with types; either int - str. Multiple definitions cannot be - merged. - - - types.coercedTo from - f to - Type to or type - from which will be coerced to - type to using function - f which takes an argument of type - from and return a value of type - to. Can be used to preserve backwards - compatibility of an option if its type was changed. - - + + + types.listOft + + + + A list of t type, e.g. types.listOf + int. Multiple definitions are merged with list concatenation. + + + + + types.attrsOft + + + + An attribute set of where all the values are of + t type. Multiple definitions result in the + joined attribute set. + + + + + types.loaOft + + + + An attribute set or a list of t type. Multiple + definitions are merged according to the value. + + + + + types.nullOrt + + + + null or type t. Multiple + definitions are merged according to type t. + + + + + types.uniqt + + + + Ensures that type t cannot be merged. It is + used to ensure option definitions are declared only once. + + + + + types.eithert1t2 + + + + Type t1 or type t2, + e.g. with types; either int str. Multiple definitions + cannot be merged. + + + + + types.coercedTofromfto + + + + Type to or type + from which will be coerced to type + to using function f + which takes an argument of type from and + return a value of type to. Can be used to + preserve backwards compatibility of an option if its type was changed. + + + + +
-
+
+ Submodule -
Submodule + + submodule is a very powerful type that defines a set of + sub-options that are handled like a separate module. + - submodule is a very powerful type that defines a set - of sub-options that are handled like a separate module. + + It takes a parameter o, that should be a set, or + a function returning a set with an options key defining + the sub-options. Submodule option definitions are type-checked accordingly + to the options declarations. Of course, you can nest + submodule option definitons for even higher modularity. + - It takes a parameter o, that should be a set, - or a function returning a set with an options key - defining the sub-options. - Submodule option definitions are type-checked accordingly to the - options declarations. - Of course, you can nest submodule option definitons for even higher - modularity. + + The option set can be defined directly + () or as reference + (). + - The option set can be defined directly - () or as reference - (). - -Directly defined submodule + + Directly defined submodule options.mod = mkOption { description = "submodule example"; @@ -251,10 +356,11 @@ options.mod = mkOption { }; }; }; -}; +}; + -Submodule defined as a - reference + + Submodule defined as a reference let modOptions = { @@ -271,19 +377,20 @@ in options.mod = mkOption { description = "submodule example"; type = with types; submodule modOptions; -}; +}; + - The submodule type is especially interesting when - used with composed types like attrsOf or - listOf. - When composed with listOf - (), - submodule allows multiple definitions of the submodule - option set (). - + + The submodule type is especially interesting when used + with composed types like attrsOf or + listOf. When composed with listOf + (), + submodule allows multiple definitions of the submodule + option set (). + -Declaration of a list - of submodules + + Declaration of a list of submodules options.mod = mkOption { description = "submodule example"; @@ -297,24 +404,27 @@ options.mod = mkOption { }; }; }); -}; +}; + -Definition of a list of - submodules + + Definition of a list of submodules config.mod = [ { foo = 1; bar = "one"; } { foo = 2; bar = "two"; } -]; +]; + - When composed with attrsOf - (), - submodule allows multiple named definitions of the - submodule option set (). + + When composed with attrsOf + (), + submodule allows multiple named definitions of the + submodule option set (). -Declaration of - attribute sets of submodules + + Declaration of attribute sets of submodules options.mod = mkOption { description = "submodule example"; @@ -328,194 +438,281 @@ options.mod = mkOption { }; }; }); -}; +}; + -Declaration of - attribute sets of submodules + + Declaration of attribute sets of submodules config.mod.one = { foo = 1; bar = "one"; }; -config.mod.two = { foo = 2; bar = "two"; }; +config.mod.two = { foo = 2; bar = "two"; }; + +
-
+
+ Extending types -
Extending types + + Types are mainly characterized by their check and + merge functions. + - Types are mainly characterized by their check and - merge functions. - - - - check - The function to type check the value. Takes a value as - parameter and return a boolean. - It is possible to extend a type check with the - addCheck function (), or to fully override the - check function (). - -Adding a type check + + + check + + + + The function to type check the value. Takes a value as parameter and + return a boolean. It is possible to extend a type check with the + addCheck function + (), or to fully + override the check function + (). + + + Adding a type check byte = mkOption { description = "An integer between 0 and 255."; type = addCheck types.int (x: x >= 0 && x <= 255); -}; - -Overriding a type - check +}; + + + Overriding a type check nixThings = mkOption { description = "words that start with 'nix'"; type = types.str // { check = (x: lib.hasPrefix "nix" x) }; -}; +}; + - - - merge - Function to merge the options values when multiple values - are set. -The function takes two parameters, loc the option path as a -list of strings, and defs the list of defined values as a -list. -It is possible to override a type merge function for custom -needs. - - + + + merge + + + + Function to merge the options values when multiple values are set. The + function takes two parameters, loc the option path as + a list of strings, and defs the list of defined values + as a list. It is possible to override a type merge function for custom + needs. + + + + +
-
- -
Custom Types - -Custom types can be created with the mkOptionType - function. -As type creation includes some more complex topics such as submodule handling, -it is recommended to get familiar with types.nix -code before creating a new type. - -The only required parameter is name. - - - - name - A string representation of the type function - name. - - - definition - Description of the type used in documentation. Give - information of the type and any of its arguments. - - - check - A function to type check the definition value. Takes the - definition value as a parameter and returns a boolean indicating the - type check result, true for success and - false for failure. - - - merge - A function to merge multiple definitions values. Takes two - parameters: - - - loc - The option path as a list of strings, e.g. - ["boot" "loader "grub" - "enable"]. - - - defs - The list of sets of defined value - and file where the value was defined, e.g. - [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; - value = 2 } ]. The merge function - should return the merged value or throw an error in case the - values are impossible or not meant to be merged. - - - - - - getSubOptions - For composed types that can take a submodule as type - parameter, this function generate sub-options documentation. It takes - the current option prefix as a list and return the set of sub-options. - Usually defined in a recursive manner by adding a term to the prefix, - e.g. prefix: elemType.getSubOptions (prefix ++ - ["prefix"]) where - "prefix" is the newly added - prefix. - - - getSubModules - For composed types that can take a submodule as type - parameter, this function should return the type parameters submodules. - If the type parameter is called elemType, the - function should just recursively look into submodules by returning - elemType.getSubModules;. - - - substSubModules - For composed types that can take a submodule as type - parameter, this function can be used to substitute the parameter of a - submodule type. It takes a module as parameter and return the type with - the submodule options substituted. It is usually defined as a type - function call with a recursive call to - substSubModules, e.g for a type - composedType that take an elemtype - type parameter, this function should be defined as m: - composedType (elemType.substSubModules m). - - - typeMerge - A function to merge multiple type declarations. Takes the - type to merge functor as parameter. A - null return value means that type cannot be - merged. - - - f - The type to merge - functor. - - - Note: There is a generic defaultTypeMerge that - work with most of value and composed types. - - - - functor - An attribute set representing the type. It is used for type - operations and has the following keys: - - - type - The type function. - - - wrapped - Holds the type parameter for composed types. - - - - payload - Holds the value parameter for value types. - The types that have a payload are the - enum, separatedString and - submodule types. - - - binOp - A binary operation that can merge the payloads of two - same types. Defined as a function that take two payloads as - parameters and return the payloads merged. - - - - - - -
+
+ Custom Types + + + Custom types can be created with the mkOptionType + function. As type creation includes some more complex topics such as + submodule handling, it is recommended to get familiar with + types.nix + code before creating a new type. + + + + The only required parameter is name. + + + + + name + + + + A string representation of the type function name. + + + + + definition + + + + Description of the type used in documentation. Give information of the + type and any of its arguments. + + + + + check + + + + A function to type check the definition value. Takes the definition value + as a parameter and returns a boolean indicating the type check result, + true for success and false for + failure. + + + + + merge + + + + A function to merge multiple definitions values. Takes two parameters: + + + + loc + + + + The option path as a list of strings, e.g. ["boot" "loader + "grub" "enable"]. + + + + + defs + + + + The list of sets of defined value and + file where the value was defined, e.g. [ { + file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } + ]. The merge function should return the + merged value or throw an error in case the values are impossible or + not meant to be merged. + + + + + + + + getSubOptions + + + + For composed types that can take a submodule as type parameter, this + function generate sub-options documentation. It takes the current option + prefix as a list and return the set of sub-options. Usually defined in a + recursive manner by adding a term to the prefix, e.g. prefix: + elemType.getSubOptions (prefix ++ + ["prefix"]) where + "prefix" is the newly added prefix. + + + + + getSubModules + + + + For composed types that can take a submodule as type parameter, this + function should return the type parameters submodules. If the type + parameter is called elemType, the function should just + recursively look into submodules by returning + elemType.getSubModules;. + + + + + substSubModules + + + + For composed types that can take a submodule as type parameter, this + function can be used to substitute the parameter of a submodule type. It + takes a module as parameter and return the type with the submodule + options substituted. It is usually defined as a type function call with a + recursive call to substSubModules, e.g for a type + composedType that take an elemtype + type parameter, this function should be defined as m: + composedType (elemType.substSubModules m). + + + + + typeMerge + + + + A function to merge multiple type declarations. Takes the type to merge + functor as parameter. A null return + value means that type cannot be merged. + + + + f + + + + The type to merge functor. + + + + + + Note: There is a generic defaultTypeMerge that work + with most of value and composed types. + + + + + functor + + + + An attribute set representing the type. It is used for type operations + and has the following keys: + + + + type + + + + The type function. + + + + + wrapped + + + + Holds the type parameter for composed types. + + + + + payload + + + + Holds the value parameter for value types. The types that have a + payload are the enum, + separatedString and submodule + types. + + + + + binOp + + + + A binary operation that can merge the payloads of two same types. + Defined as a function that take two payloads as parameters and return + the payloads merged. + + + + + + + +
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index afcb970ed700..d4e5ff3f4312 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -3,252 +3,258 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-releases"> - -Releases - -
+ Releases +
Release process - Going through an example of releasing NixOS 17.09: + Going through an example of releasing NixOS 17.09:
- One month before the beta - - - - Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month. - - - - - Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. - Any issue or Pull Request targeting the release should be included in the release milestone. - - - -
-
- At beta release time - - - - Create - an issue for tracking Zero Hydra Failures progress. ZHF is an effort - to get build failures down to zero. - - - - - git tag -a -s -m "Release 17.09-beta" 17.09-beta && git push --tags - - - - - From the master branch run git checkout -B release-17.09. - - - - - - Make sure a channel is created at http://nixos.org/channels/. - - - - - - - Let a GitHub nixpkgs admin lock the branch on github for you. - (so developers can’t force push) - - - - - - - Bump the system.defaultChannel attribute in - nixos/modules/misc/version.nix - - - - - - - Update versionSuffix in - nixos/release.nix, use - git log --format=%an|wc -l to get the commit - count - - - - - echo -n "18.03" > .version on - master. - - - - - - Pick a new name for the unstable branch. - - - - - - Create a new release notes file for the upcoming release + 1, in this - case rl-1803.xml. - - - - - Create two Hydra jobsets: release-17.09 and release-17.09-small with stableBranch set to false. - - - - - Edit changelog at - nixos/doc/manual/release-notes/rl-1709.xml - (double check desktop versions are noted) - - - - - Get all new NixOS modules - git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+ - - - - - Note systemd, kernel, glibc and Nix upgrades. - - - - - -
-
- During Beta - - - - Monitor the master branch for bugfixes and minor updates - and cherry-pick them to the release branch. - - - -
-
- Before the final release - - - - Re-check that the release notes are complete. - - - - - Release Nix (currently only Eelco Dolstra can do that). - - Make sure fallback is updated. - - - - - - - Update README.md with new stable NixOS version information. - - - - - - Change stableBranch to true and wait for channel to update. - - - -
-
- At final release time - - - - git tag -s -a -m "Release 15.09" 15.09 - - - - - Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations - - - - - Get number of commits for the release: - git log release-14.04..release-14.12 --format=%an|wc -l - - - - - Commits by contributor: - git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn - - - - - Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated - to see what needs to be included. - - - -
-
+ One month before the beta -
+ + + + Send an email to the nix-devel mailinglist as a warning about upcoming + beta "feature freeze" in a month. + + + + + Discuss with Eelco Dolstra and the community (via IRC, ML) about what + will reach the deadline. Any issue or Pull Request targeting the release + should be included in the release milestone. + + + +
+ +
+ At beta release time + + + + + Create + an issue for tracking Zero Hydra Failures progress. ZHF is an effort to + get build failures down to zero. + + + + + git tag -a -s -m "Release 17.09-beta" 17.09-beta + && git push --tags + + + + + From the master branch run git checkout -B + release-17.09. + + + + + + Make sure a channel is created at http://nixos.org/channels/. + + + + + + Let a GitHub nixpkgs admin lock the branch on github for you. (so + developers can’t force push) + + + + + + Bump the system.defaultChannel attribute in + nixos/modules/misc/version.nix + + + + + + Update versionSuffix in + nixos/release.nix, use git log + --format=%an|wc -l to get the commit count + + + + + echo -n "18.03" > .version on master. + + + + + + Pick a new name for the unstable branch. + + + + + Create a new release notes file for the upcoming release + 1, in this + case rl-1803.xml. + + + + + Create two Hydra jobsets: release-17.09 and release-17.09-small with + stableBranch set to false. + + + + + Edit changelog at + nixos/doc/manual/release-notes/rl-1709.xml (double + check desktop versions are noted) + + + + + Get all new NixOS modules git diff + release-17.03..release-17.09 nixos/modules/module-list.nix|grep + ^+ + + + + + Note systemd, kernel, glibc and Nix upgrades. + + + + + +
+ +
+ During Beta + + + + + Monitor the master branch for bugfixes and minor updates and cherry-pick + them to the release branch. + + + +
+ +
+ Before the final release + + + + + Re-check that the release notes are complete. + + + + + Release Nix (currently only Eelco Dolstra can do that). + + Make sure fallback is updated. + + + + + + Update README.md with new stable NixOS version information. + + + + + Change stableBranch to true and wait for channel to + update. + + + +
+ +
+ At final release time + + + + + git tag -s -a -m "Release 15.09" 15.09 + + + + + Update http://nixos.org/nixos/download.html and + http://nixos.org/nixos/manual in + https://github.com/NixOS/nixos-org-configurations + + + + + Get number of commits for the release: git log + release-14.04..release-14.12 --format=%an|wc -l + + + + + Commits by contributor: git log release-14.04..release-14.12 + --format=%an|sort|uniq -c|sort -rn + + + + + Send an email to nix-dev to announce the release with above information. + Best to check how previous email was formulated to see what needs to be + included. + + + +
+
+
Release schedule - - - - - - + + + + + + Date - + Event - - - - - + + + + + 2016-07-25 - + Send email to nix-dev about upcoming branch-off - - - + + + 2016-09-01 - - release-16.09 branch and corresponding jobsets are created, + release-16.09 branch and corresponding jobsets are created, change freeze - - - + + + 2016-09-30 - + NixOS 16.09 released - - - + + + -
- +
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml index cc0539ec5109..7b103c36d907 100644 --- a/nixos/doc/manual/development/replace-modules.xml +++ b/nixos/doc/manual/development/replace-modules.xml @@ -3,27 +3,31 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-replace-modules"> + Replace Modules -Replace Modules + + Modules that are imported can also be disabled. The option declarations and + config implementation of a disabled module will be ignored, allowing another + to take it's place. This can be used to import a set of modules from another + channel while keeping the rest of the system on a stable release. + -Modules that are imported can also be disabled. The option - declarations and config implementation of a disabled module will be - ignored, allowing another to take it's place. This can be used to - import a set of modules from another channel while keeping the rest - of the system on a stable release. -disabledModules is a top level attribute like + + disabledModules is a top level attribute like imports, options and - config. It contains a list of modules that will - be disabled. This can either be the full path to the module or a - string with the filename relative to the modules path - (eg. <nixpkgs/nixos/modules> for nixos). - + config. It contains a list of modules that will be + disabled. This can either be the full path to the module or a string with the + filename relative to the modules path (eg. <nixpkgs/nixos/modules> for + nixos). + -This example will replace the existing postgresql module with - the version defined in the nixos-unstable channel while keeping the - rest of the modules and packages from the original nixos channel. - This only overrides the module definition, this won't use postgresql - from nixos-unstable unless explicitly configured to do so. + + This example will replace the existing postgresql module with the version + defined in the nixos-unstable channel while keeping the rest of the modules + and packages from the original nixos channel. This only overrides the module + definition, this won't use postgresql from nixos-unstable unless explicitly + configured to do so. + { config, lib, pkgs, ... }: @@ -41,10 +45,11 @@ } -This example shows how to define a custom module as a - replacement for an existing module. Importing this module will - disable the original module without having to know it's - implementation details. + + This example shows how to define a custom module as a replacement for an + existing module. Importing this module will disable the original module + without having to know it's implementation details. + { config, lib, pkgs, ... }: @@ -71,5 +76,4 @@ in }; } - diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index e47490777815..862b364a6d79 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -3,41 +3,38 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-running-nixos-tests"> -Running Tests interactively - -The test itself can be run interactively. This is -particularly useful when developing or debugging a test: + Running Tests interactively + + The test itself can be run interactively. This is particularly useful when + developing or debugging a test: $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-test-driver starting VDE switch for network 1 > - -You can then take any Perl statement, e.g. - + You can then take any Perl statement, e.g. > startAll > testScript > $machine->succeed("touch /tmp/foo") + The function testScript executes the entire test script + and drops you back into the test driver command line upon its completion. + This allows you to inspect the state of the VMs after the test (e.g. to debug + the test script). + -The function testScript executes the entire test -script and drops you back into the test driver command line upon its -completion. This allows you to inspect the state of the VMs after the -test (e.g. to debug the test script). - -To just start and experiment with the VMs, run: - + + To just start and experiment with the VMs, run: $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-run-vms - -The script nixos-run-vms starts the virtual -machines defined by test. The root file system of the VMs is created -on the fly and kept across VM restarts in -./hostname.qcow2. - + The script nixos-run-vms starts the virtual machines + defined by test. The root file system of the VMs is created on the fly and + kept across VM restarts in + ./hostname.qcow2. + diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index 908c0a66a32d..eadbe1ea4f26 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -3,20 +3,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-running-nixos-tests-interactively"> + Running Tests -Running Tests - -You can run tests using nix-build. For -example, to run the test + You can run tests using nix-build. For example, to run the + test + login.nix, -you just do: - + you just do: $ nix-build '<nixpkgs/nixos/tests/login.nix>' - -or, if you don’t want to rely on NIX_PATH: - + or, if you don’t want to rely on NIX_PATH: $ cd /my/nixpkgs/nixos/tests $ nix-build login.nix @@ -26,16 +24,13 @@ machine: QEMU running (pid 8841) … 6 out of 6 tests succeeded - -After building/downloading all required dependencies, this will -perform a build that starts a QEMU/KVM virtual machine containing a -NixOS system. The virtual machine mounts the Nix store of the host; -this makes VM creation very fast, as no disk image needs to be -created. Afterwards, you can view a pretty-printed log of the test: - + After building/downloading all required dependencies, this will perform a + build that starts a QEMU/KVM virtual machine containing a NixOS system. The + virtual machine mounts the Nix store of the host; this makes VM creation very + fast, as no disk image needs to be created. Afterwards, you can view a + pretty-printed log of the test: $ firefox result/log.html - - + diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index a2896cd7a135..c7b64cb84beb 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -3,101 +3,84 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-getting-sources"> - -Getting the Sources - -By default, NixOS’s nixos-rebuild command -uses the NixOS and Nixpkgs sources provided by the -nixos channel (kept in -/nix/var/nix/profiles/per-user/root/channels/nixos). -To modify NixOS, however, you should check out the latest sources from -Git. This is as follows: - + Getting the Sources + + By default, NixOS’s nixos-rebuild command uses the NixOS + and Nixpkgs sources provided by the nixos channel (kept in + /nix/var/nix/profiles/per-user/root/channels/nixos). To + modify NixOS, however, you should check out the latest sources from Git. This + is as follows: $ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git $ git remote update channels - -This will check out the latest Nixpkgs sources to -./nixpkgs the NixOS sources to -./nixpkgs/nixos. (The NixOS source tree lives in -a subdirectory of the Nixpkgs repository.) The remote -channels refers to a read-only repository that -tracks the Nixpkgs/NixOS channels (see -for more information about channels). Thus, the Git branch -channels/nixos-17.03 will contain the latest built -and tested version available in the nixos-17.03 -channel. - -It’s often inconvenient to develop directly on the master -branch, since if somebody has just committed (say) a change to GCC, -then the binary cache may not have caught up yet and you’ll have to -rebuild everything from source. So you may want to create a local -branch based on your current NixOS version: - + This will check out the latest Nixpkgs sources to + ./nixpkgs the NixOS sources to + ./nixpkgs/nixos. (The NixOS source tree lives in a + subdirectory of the Nixpkgs repository.) The remote + channels refers to a read-only repository that tracks the + Nixpkgs/NixOS channels (see for more + information about channels). Thus, the Git branch + channels/nixos-17.03 will contain the latest built and + tested version available in the nixos-17.03 channel. + + + It’s often inconvenient to develop directly on the master branch, since if + somebody has just committed (say) a change to GCC, then the binary cache may + not have caught up yet and you’ll have to rebuild everything from source. + So you may want to create a local branch based on your current NixOS version: $ nixos-version 17.09pre104379.6e0b727 (Hummingbird) $ git checkout -b local 6e0b727 - -Or, to base your local branch on the latest version available in a -NixOS channel: - + Or, to base your local branch on the latest version available in a NixOS + channel: $ git remote update channels $ git checkout -b local channels/nixos-17.03 - -(Replace nixos-17.03 with the name of the channel -you want to use.) You can use git merge or -git rebase to keep your local branch in sync with -the channel, e.g. - + (Replace nixos-17.03 with the name of the channel you want + to use.) You can use git merge or git + rebase to keep your local branch in sync with the channel, e.g. $ git remote update channels $ git merge channels/nixos-17.03 - -You can use git cherry-pick to copy commits from -your local branch to the upstream branch. - -If you want to rebuild your system using your (modified) -sources, you need to tell nixos-rebuild about them -using the flag: - + You can use git cherry-pick to copy commits from your + local branch to the upstream branch. + + + If you want to rebuild your system using your (modified) sources, you need to + tell nixos-rebuild about them using the + flag: # nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs - - - -If you want nix-env to use the expressions in -/my/sources, use nix-env -f -/my/sources/nixpkgs, or change -the default by adding a symlink in -~/.nix-defexpr: - + + + If you want nix-env to use the expressions in + /my/sources, use nix-env -f + /my/sources/nixpkgs, or change the + default by adding a symlink in ~/.nix-defexpr: $ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs - -You may want to delete the symlink -~/.nix-defexpr/channels_root to prevent root’s -NixOS channel from clashing with your own tree (this may break the -command-not-found utility though). If you want to go back to the default -state, you may just remove the ~/.nix-defexpr -directory completely, log out and log in again and it should have been -recreated with a link to the root channels. - + You may want to delete the symlink + ~/.nix-defexpr/channels_root to prevent root’s NixOS + channel from clashing with your own tree (this may break the + command-not-found utility though). If you want to go back to the default + state, you may just remove the ~/.nix-defexpr directory + completely, log out and log in again and it should have been recreated with a + link to the root channels. + - diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml index 16bc8125d9ff..63f5f3de7f4d 100644 --- a/nixos/doc/manual/development/testing-installer.xml +++ b/nixos/doc/manual/development/testing-installer.xml @@ -3,27 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-testing-installer"> - -Testing the Installer - -Building, burning, and booting from an installation CD is rather -tedious, so here is a quick way to see if the installer works -properly: - + Testing the Installer + + Building, burning, and booting from an installation CD is rather tedious, so + here is a quick way to see if the installer works properly: # mount -t tmpfs none /mnt # nixos-generate-config --root /mnt $ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install # ./result/bin/nixos-install - -To start a login shell in the new NixOS installation in -/mnt: - + To start a login shell in the new NixOS installation in + /mnt: $ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter # ./result/bin/nixos-enter - - - + diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 8b787fae1fe0..8ecdd1c770f2 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -3,157 +3,147 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-writing-documentation"> + Writing NixOS Documentation + + As NixOS grows, so too does the need for a catalogue and explanation of its + extensive functionality. Collecting pertinent information from disparate + sources and presenting it in an accessible style would be a worthy + contribution to the project. + +
+ Building the Manual -Writing NixOS Documentation + + The DocBook sources of the are in the + nixos/doc/manual + subdirectory of the Nixpkgs repository. + - - As NixOS grows, so too does the need for a catalogue and explanation - of its extensive functionality. Collecting pertinent information - from disparate sources and presenting it in an accessible style - would be a worthy contribution to the project. - - -
-Building the Manual - - The DocBook sources of the are in the - nixos/doc/manual - subdirectory of the Nixpkgs repository. - - - - You can quickly validate your edits with make: - + + You can quickly validate your edits with make: + $ cd /path/to/nixpkgs/nixos/doc/manual $ make - - Once you are done making modifications to the manual, it's important - to build it before committing. You can do that as follows: - + + Once you are done making modifications to the manual, it's important to + build it before committing. You can do that as follows: + nix-build nixos/release.nix -A manual.x86_64-linux - - When this command successfully finishes, it will tell you where the - manual got generated. The HTML will be accessible through the - result symlink at - ./result/share/doc/nixos/index.html. - -
+ + When this command successfully finishes, it will tell you where the manual + got generated. The HTML will be accessible through the + result symlink at + ./result/share/doc/nixos/index.html. + +
+
+ Editing DocBook XML -
-Editing DocBook XML + + For general information on how to write in DocBook, see + DocBook + 5: The Definitive Guide. + - - For general information on how to write in DocBook, see - - DocBook 5: The Definitive Guide. - + + Emacs nXML Mode is very helpful for editing DocBook XML because it validates + the document as you write, and precisely locates errors. To use it, see + . + - - Emacs nXML Mode is very helpful for editing DocBook XML because it - validates the document as you write, and precisely locates - errors. To use it, see . - - - - Pandoc can generate - DocBook XML from a multitude of formats, which makes a good starting - point. - - + + Pandoc can generate DocBook XML + from a multitude of formats, which makes a good starting point. + Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML - pandoc -f markdown_github -t docbook5 docs.md -o my-section.md - +pandoc -f markdown_github -t docbook5 docs.md -o my-section.md + + Pandoc can also quickly convert a single section.xml to + HTML, which is helpful when drafting. + - Pandoc can also quickly convert a single - section.xml to HTML, which is helpful when - drafting. - - - - Sometimes writing valid DocBook is simply too difficult. In this - case, submit your documentation updates in a + Sometimes writing valid DocBook is simply too difficult. In this case, + submit your documentation updates in a + GitHub - Issue and someone will handle the conversion to XML for you. - -
+ Issue and someone will handle the conversion to XML for you. + +
+
+ Creating a Topic -
-Creating a Topic + + You can use an existing topic as a basis for the new topic or create a topic + from scratch. + - - You can use an existing topic as a basis for the new topic or create a topic from scratch. - + + Keep the following guidelines in mind when you create and add a topic: + + + + The NixOS + book + element is in nixos/doc/manual/manual.xml. It + includes several + parts + which are in subdirectories. + + + + + Store the topic file in the same directory as the part to + which it belongs. If your topic is about configuring a NixOS module, then + the XML file can be stored alongside the module definition + nix file. + + + + + If you include multiple words in the file name, separate the words with a + dash. For example: ipv6-config.xml. + + + + + Make sure that the xml:id value is unique. You can use + abbreviations if the ID is too long. For example: + nixos-config. + + + + + Determine whether your topic is a chapter or a section. If you are + unsure, open an existing topic file and check whether the main element is + chapter or section. + + + + +
+
+ Adding a Topic to the Book - -Keep the following guidelines in mind when you create and add a topic: + + Open the parent XML file and add an xi:include element to + the list of chapters with the file name of the topic that you created. If + you created a section, you add the file to the chapter + file. If you created a chapter, you add the file to the + part file. + - - - The NixOS book - element is in nixos/doc/manual/manual.xml. - It includes several - parts - which are in subdirectories. - - - - Store the topic file in the same directory as the part - to which it belongs. If your topic is about configuring a NixOS - module, then the XML file can be stored alongside the module - definition nix file. - - - - If you include multiple words in the file name, separate the words - with a dash. For example: ipv6-config.xml. - - - - Make sure that the xml:id value is unique. You can use - abbreviations if the ID is too long. For example: - nixos-config. - - - - Determine whether your topic is a chapter or a section. If you are - unsure, open an existing topic file and check whether the main - element is chapter or section. - - - - - -
- -
-Adding a Topic to the Book - - - Open the parent XML file and add an xi:include - element to the list of chapters with the file name of the topic that - you created. If you created a section, you add the file to - the chapter file. If you created a chapter, you - add the file to the part file. - - - - If the topic is about configuring a NixOS module, it can be - automatically included in the manual by using the - meta.doc attribute. See + If the topic is about configuring a NixOS module, it can be automatically + included in the manual by using the meta.doc attribute. + See for an explanation. - - -
- - - - - - + +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index a49f99cb2669..bbf793bb0be9 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -3,52 +3,54 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-writing-modules"> - -Writing NixOS Modules - -NixOS has a modular system for declarative configuration. This -system combines multiple modules to produce the -full system configuration. One of the modules that constitute the -configuration is /etc/nixos/configuration.nix. -Most of the others live in the Writing NixOS Modules + + NixOS has a modular system for declarative configuration. This system + combines multiple modules to produce the full system + configuration. One of the modules that constitute the configuration is + /etc/nixos/configuration.nix. Most of the others live in + the + nixos/modules -subdirectory of the Nixpkgs tree. - -Each NixOS module is a file that handles one logical aspect of -the configuration, such as a specific kind of hardware, a service, or -network settings. A module configuration does not have to handle -everything from scratch; it can use the functionality provided by -other modules for its implementation. Thus a module can -declare options that can be used by other -modules, and conversely can define options -provided by other modules in its own implementation. For example, the -module + + Each NixOS module is a file that handles one logical aspect of the + configuration, such as a specific kind of hardware, a service, or network + settings. A module configuration does not have to handle everything from + scratch; it can use the functionality provided by other modules for its + implementation. Thus a module can declare options that + can be used by other modules, and conversely can define + options provided by other modules in its own implementation. For example, the + module + pam.nix -declares the option that allows -other modules (e.g. security.pam.services that allows other + modules (e.g. + sshd.nix) -to define PAM services; and it defines the option - (declared by environment.etc (declared by + etc.nix) -to cause files to be created in -/etc/pam.d. - -In /etc/pam.d. + + + In , we saw the following structure -of NixOS modules: - + of NixOS modules: { config, pkgs, ... }: { option definitions } - -This is actually an abbreviated form of module -that only defines options, but does not declare any. The structure of -full NixOS modules is shown in . - -Structure of NixOS Modules + This is actually an abbreviated form of module that only + defines options, but does not declare any. The structure of full NixOS + modules is shown in . + + + Structure of NixOS Modules { config, pkgs, ... }: @@ -65,56 +67,56 @@ full NixOS modules is shown in . option definitions }; } - - -The meaning of each part is as follows. - - - - This line makes the current Nix expression a function. The - variable pkgs contains Nixpkgs, while - config contains the full system configuration. - This line can be omitted if there is no reference to - pkgs and config inside the - module. - - - - This list enumerates the paths to other NixOS modules that - should be included in the evaluation of the system configuration. - A default set of modules is defined in the file - modules/module-list.nix. These don't need to - be added in the import list. - - - - The attribute options is a nested set of - option declarations (described below). - - - - The attribute config is a nested set of - option definitions (also described - below). - - - - - - shows a module that handles -the regular update of the “locate” database, an index of all files in -the file system. This module declares two options that can be defined -by other modules (typically the user’s -configuration.nix): - (whether the database should -be updated) and (when the -update should be done). It implements its functionality by defining -two options declared by other modules: - (the set of all systemd services) -and (the list of commands to be -executed periodically by systemd). - -NixOS Module for the “locate” Service + + + The meaning of each part is as follows. + + + + This line makes the current Nix expression a function. The variable + pkgs contains Nixpkgs, while config + contains the full system configuration. This line can be omitted if there + is no reference to pkgs and config + inside the module. + + + + + This list enumerates the paths to other NixOS modules that should be + included in the evaluation of the system configuration. A default set of + modules is defined in the file + modules/module-list.nix. These don't need to be added + in the import list. + + + + + The attribute options is a nested set of + option declarations (described below). + + + + + The attribute config is a nested set of + option definitions (also described below). + + + + + + shows a module that handles the regular + update of the “locate” database, an index of all files in the file + system. This module declares two options that can be defined by other modules + (typically the user’s configuration.nix): + (whether the database should be + updated) and (when the update + should be done). It implements its functionality by defining two options + declared by other modules: (the set of all + systemd services) and (the list of commands + to be executed periodically by systemd). + + + NixOS Module for the “locate” Service { config, lib, pkgs, ... }: @@ -173,14 +175,12 @@ in { }; } - - - - - - - - - - + + + + + + + + diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index a8f6aa00858e..89a6a4423627 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -3,11 +3,10 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-writing-nixos-tests"> + Writing Tests -Writing Tests - -A NixOS test is a Nix expression that has the following structure: - + + A NixOS test is a Nix expression that has the following structure: import ./make-test.nix { @@ -32,277 +31,364 @@ import ./make-test.nix { ''; } - -The attribute testScript is a bit of Perl code that -executes the test (described below). During the test, it will start -one or more virtual machines, the configuration of which is described -by the attribute machine (if you need only one -machine in your test) or by the attribute nodes (if -you need multiple machines). For instance, testScript is a bit of Perl code that + executes the test (described below). During the test, it will start one or + more virtual machines, the configuration of which is described by the + attribute machine (if you need only one machine in your + test) or by the attribute nodes (if you need multiple + machines). For instance, + login.nix -only needs a single machine to test whether users can log in on the -virtual console, whether device ownership is correctly maintained when -switching between consoles, and so on. On the other hand, nfs.nix, -which tests NFS client and server functionality in the Linux kernel -(including whether locks are maintained across server crashes), -requires three machines: a server and two clients. - -There are a few special NixOS configuration options for test -VMs: + which tests NFS client and server functionality in the Linux kernel + (including whether locks are maintained across server crashes), requires + three machines: a server and two clients. + + + There are a few special NixOS configuration options for test VMs: - - - - - - The memory of the VM in - megabytes. - - - - - The virtual networks to which the VM is - connected. See + + + + + + The memory of the VM in megabytes. + + + + + + + + + The virtual networks to which the VM is connected. See + nat.nix - for an example. - - - - - By default, the Nix store in the VM is not - writable. If you enable this option, a writable union file system - is mounted on top of the Nix store to make it appear - writable. This is necessary for tests that run Nix operations that - modify the store. - - - - -For more options, see the module qemu-vm.nix. - -The test script is a sequence of Perl statements that perform -various actions, such as starting VMs, executing commands in the VMs, -and so on. Each virtual machine is represented as an object stored in -the variable $name, -where name is the identifier of the machine -(which is just machine if you didn’t specify -multiple machines using the nodes attribute). For -instance, the following starts the machine, waits until it has -finished booting, then executes a command and checks that the output -is more-or-less correct: + for an example. + + + + + + + + + By default, the Nix store in the VM is not writable. If you enable this + option, a writable union file system is mounted on top of the Nix store + to make it appear writable. This is necessary for tests that run Nix + operations that modify the store. + + + + + For more options, see the module + qemu-vm.nix. + + + The test script is a sequence of Perl statements that perform various + actions, such as starting VMs, executing commands in the VMs, and so on. Each + virtual machine is represented as an object stored in the variable + $name, where + name is the identifier of the machine (which is + just machine if you didn’t specify multiple machines + using the nodes attribute). For instance, the following + starts the machine, waits until it has finished booting, then executes a + command and checks that the output is more-or-less correct: $machine->start; $machine->waitForUnit("default.target"); $machine->succeed("uname") =~ /Linux/; - -The first line is actually unnecessary; machines are implicitly -started when you first execute an action on them (such as -waitForUnit or succeed). If you -have multiple machines, you can speed up the test by starting them in -parallel: - + The first line is actually unnecessary; machines are implicitly started when + you first execute an action on them (such as waitForUnit + or succeed). If you have multiple machines, you can speed + up the test by starting them in parallel: startAll; + - - -The following methods are available on machine objects: - - - - - start - Start the virtual machine. This method is - asynchronous — it does not wait for the machine to finish - booting. - - - - shutdown - Shut down the machine, waiting for the VM to - exit. - - - - crash - Simulate a sudden power failure, by telling the VM - to exit immediately. - - - - block - Simulate unplugging the Ethernet cable that - connects the machine to the other machines. - - - - unblock - Undo the effect of - block. - - - - screenshot - Take a picture of the display of the virtual - machine, in PNG format. The screenshot is linked from the HTML - log. - - - - getScreenText - Return a textual representation of what is currently - visible on the machine's screen using optical character - recognition. - This requires passing to the test - attribute set. - - - - sendMonitorCommand - Send a command to the QEMU monitor. This is rarely - used, but allows doing stuff such as attaching virtual USB disks - to a running machine. - - - - sendKeys - Simulate pressing keys on the virtual keyboard, - e.g., sendKeys("ctrl-alt-delete"). - - - - sendChars - Simulate typing a sequence of characters on the - virtual keyboard, e.g., sendKeys("foobar\n") - will type the string foobar followed by the - Enter key. - - - - execute - Execute a shell command, returning a list - (status, - stdout). - - - - succeed - Execute a shell command, raising an exception if - the exit status is not zero, otherwise returning the standard - output. - - - - fail - Like succeed, but raising - an exception if the command returns a zero status. - - - - waitUntilSucceeds - Repeat a shell command with 1-second intervals - until it succeeds. - - - - waitUntilFails - Repeat a shell command with 1-second intervals - until it fails. - - - - waitForUnit - Wait until the specified systemd unit has reached - the “active” state. - - - - waitForFile - Wait until the specified file - exists. - - - - waitForOpenPort - Wait until a process is listening on the given TCP - port (on localhost, at least). - - - - waitForClosedPort - Wait until nobody is listening on the given TCP - port. - - - - waitForX - Wait until the X11 server is accepting - connections. - - - - waitForText - Wait until the supplied regular expressions matches - the textual contents of the screen by using optical character recognition - (see getScreenText). - This requires passing to the test - attribute set. - - - - waitForWindow - Wait until an X11 window has appeared whose name - matches the given regular expression, e.g., - waitForWindow(qr/Terminal/). - - - - copyFileFromHost - Copies a file from host to machine, e.g., - copyFileFromHost("myfile", "/etc/my/important/file"). - The first argument is the file on the host. The file needs to be - accessible while building the nix derivation. The second argument is - the location of the file on the machine. - - - - - systemctl + + The following methods are available on machine objects: + + + start + - Runs systemctl commands with optional support for - systemctl --user - - + + Start the virtual machine. This method is asynchronous — it does not + wait for the machine to finish booting. + + + + + shutdown + + + + Shut down the machine, waiting for the VM to exit. + + + + + crash + + + + Simulate a sudden power failure, by telling the VM to exit immediately. + + + + + block + + + + Simulate unplugging the Ethernet cable that connects the machine to the + other machines. + + + + + unblock + + + + Undo the effect of block. + + + + + screenshot + + + + Take a picture of the display of the virtual machine, in PNG format. The + screenshot is linked from the HTML log. + + + + + getScreenText + + + + Return a textual representation of what is currently visible on the + machine's screen using optical character recognition. + + + + This requires passing to the test attribute + set. + + + + + + sendMonitorCommand + + + + Send a command to the QEMU monitor. This is rarely used, but allows doing + stuff such as attaching virtual USB disks to a running machine. + + + + + sendKeys + + + + Simulate pressing keys on the virtual keyboard, e.g., + sendKeys("ctrl-alt-delete"). + + + + + sendChars + + + + Simulate typing a sequence of characters on the virtual keyboard, e.g., + sendKeys("foobar\n") will type the string + foobar followed by the Enter key. + + + + + execute + + + + Execute a shell command, returning a list + (status, + stdout). + + + + + succeed + + + + Execute a shell command, raising an exception if the exit status is not + zero, otherwise returning the standard output. + + + + + fail + + + + Like succeed, but raising an exception if the + command returns a zero status. + + + + + waitUntilSucceeds + + + + Repeat a shell command with 1-second intervals until it succeeds. + + + + + waitUntilFails + + + + Repeat a shell command with 1-second intervals until it fails. + + + + + waitForUnit + + + + Wait until the specified systemd unit has reached the “active” state. + + + + + waitForFile + + + + Wait until the specified file exists. + + + + + waitForOpenPort + + + + Wait until a process is listening on the given TCP port (on + localhost, at least). + + + + + waitForClosedPort + + + + Wait until nobody is listening on the given TCP port. + + + + + waitForX + + + + Wait until the X11 server is accepting connections. + + + + + waitForText + + + + Wait until the supplied regular expressions matches the textual contents + of the screen by using optical character recognition (see + getScreenText). + + + + This requires passing to the test attribute + set. + + + + + + waitForWindow + + + + Wait until an X11 window has appeared whose name matches the given + regular expression, e.g., waitForWindow(qr/Terminal/). + + + + + copyFileFromHost + + + + Copies a file from host to machine, e.g., + copyFileFromHost("myfile", "/etc/my/important/file"). + + + The first argument is the file on the host. The file needs to be + accessible while building the nix derivation. The second argument is the + location of the file on the machine. + + + + + systemctl + + + + Runs systemctl commands with optional support for + systemctl --user + + + $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` - + - + + + - - - - - - To test user units declared by systemd.user.services the optional $user - argument can be used: - - + + To test user units declared by systemd.user.services the + optional $user argument can be used: + $machine->start; $machine->waitForX; $machine->waitForUnit("xautolock.service", "x-session-user"); - This applies to systemctl, getUnitInfo, - waitForUnit, startJob - and stopJob. - - + waitForUnit, startJob and + stopJob. + diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 52d8a292f8be..680160a3cb7e 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -2,101 +2,84 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="sec-changing-config"> - -Changing the Configuration - -The file /etc/nixos/configuration.nix -contains the current configuration of your machine. Whenever you’ve -changed something in that file, you should do - + Changing the Configuration + + The file /etc/nixos/configuration.nix contains the + current configuration of your machine. Whenever you’ve + changed something in that file, you + should do # nixos-rebuild switch - -to build the new configuration, make it the default configuration for -booting, and try to realise the configuration in the running system -(e.g., by restarting system services). - -These commands must be executed as root, so you should -either run them from a root shell or by prefixing them with -sudo -i. - -You can also do - + to build the new configuration, make it the default configuration for + booting, and try to realise the configuration in the running system (e.g., by + restarting system services). + + + + These commands must be executed as root, so you should either run them from + a root shell or by prefixing them with sudo -i. + + + + You can also do # nixos-rebuild test - -to build the configuration and switch the running system to it, but -without making it the boot default. So if (say) the configuration -locks up your machine, you can just reboot to get back to a working -configuration. - -There is also - + to build the configuration and switch the running system to it, but without + making it the boot default. So if (say) the configuration locks up your + machine, you can just reboot to get back to a working configuration. + + + There is also # nixos-rebuild boot - -to build the configuration and make it the boot default, but not -switch to it now (so it will only take effect after the next -reboot). - -You can make your configuration show up in a different submenu -of the GRUB 2 boot screen by giving it a different profile -name, e.g. - + to build the configuration and make it the boot default, but not switch to it + now (so it will only take effect after the next reboot). + + + You can make your configuration show up in a different submenu of the GRUB 2 + boot screen by giving it a different profile name, e.g. # nixos-rebuild switch -p test - -which causes the new configuration (and previous ones created using --p test) to show up in the GRUB submenu “NixOS - -Profile 'test'”. This can be useful to separate test configurations -from “stable” configurations. - -Finally, you can do - + which causes the new configuration (and previous ones created using + -p test) to show up in the GRUB submenu “NixOS - Profile + 'test'”. This can be useful to separate test configurations from + “stable” configurations. + + + Finally, you can do $ nixos-rebuild build - -to build the configuration but nothing more. This is useful to see -whether everything compiles cleanly. - -If you have a machine that supports hardware virtualisation, you -can also test the new configuration in a sandbox by building and -running a QEMU virtual machine that contains the -desired configuration. Just do - + to build the configuration but nothing more. This is useful to see whether + everything compiles cleanly. + + + If you have a machine that supports hardware virtualisation, you can also + test the new configuration in a sandbox by building and running a QEMU + virtual machine that contains the desired configuration. + Just do $ nixos-rebuild build-vm $ ./result/bin/run-*-vm - -The VM does not have any data from your host system, so your existing -user accounts and home directories will not be available unless you -have set mutableUsers = false. Another way is to -temporarily add the following to your configuration: - + The VM does not have any data from your host system, so your existing user + accounts and home directories will not be available unless you have set + mutableUsers = false. Another way is to temporarily add + the following to your configuration: users.extraUsers.your-user.initialHashedPassword = "test"; - -Important: delete the $hostname.qcow2 file if you -have started the virtual machine at least once without the right -users, otherwise the changes will not get picked up. - -You can forward ports on the host to the guest. For -instance, the following will forward host port 2222 to guest port 22 -(SSH): - + Important: delete the $hostname.qcow2 file if you have + started the virtual machine at least once without the right users, otherwise + the changes will not get picked up. You can forward ports on the host to the + guest. For instance, the following will forward host port 2222 to guest port + 22 (SSH): $ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm - -allowing you to log in via SSH (assuming you have set the appropriate -passwords or SSH authorized keys): - + allowing you to log in via SSH (assuming you have set the appropriate + passwords or SSH authorized keys): $ ssh -p 2222 localhost - - - + diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index ee61bedc4183..d4276be95d68 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -3,19 +3,15 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-installation"> - -Installation - - - -This section describes how to obtain, install, and configure -NixOS for first-time use. - - - - - - - - + Installation + + + This section describes how to obtain, install, and configure NixOS for + first-time use. + + + + + + diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 7e6ddb05cd66..8b0c350b064d 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -5,284 +5,325 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-installing-from-other-distro"> + Installing from another Linux distribution - Installing from another Linux distribution + + Because Nix (the package manager) & Nixpkgs (the Nix packages collection) + can both be installed on any (most?) Linux distributions, they can be used to + install NixOS in various creative ways. You can, for instance: + - - Because Nix (the package manager) & Nixpkgs (the Nix packages - collection) can both be installed on any (most?) Linux distributions, - they can be used to install NixOS in various creative ways. You can, - for instance: - + + + + Install NixOS on another partition, from your existing Linux distribution + (without the use of a USB or optical device!) + + + + + Install NixOS on the same partition (in place!), from your existing + non-NixOS Linux distribution using NIXOS_LUSTRATE. + + + + + Install NixOS on your hard drive from the Live CD of any Linux + distribution. + + + - - Install NixOS on another partition, from your existing - Linux distribution (without the use of a USB or optical - device!) + + The first steps to all these are the same: + - Install NixOS on the same partition (in place!), from - your existing non-NixOS Linux distribution using - NIXOS_LUSTRATE. - - Install NixOS on your hard drive from the Live CD of - any Linux distribution. - - - The first steps to all these are the same: - - - - Install the Nix package manager: - - Short version: - - + + + + Install the Nix package manager: + + + Short version: + + $ bash <(curl https://nixos.org/nix/install) $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell - - More details in the + More details in the + - Nix manual - - - - Switch to the NixOS channel: - - If you've just installed Nix on a non-NixOS distribution, you - will be on the nixpkgs channel by - default. - - + Nix manual + + + + + Switch to the NixOS channel: + + + If you've just installed Nix on a non-NixOS distribution, you will be on + the nixpkgs channel by default. + + $ nix-channel --list nixpkgs https://nixos.org/channels/nixpkgs-unstable - - As that channel gets released without running the NixOS - tests, it will be safer to use the nixos-* - channels instead: - - + + As that channel gets released without running the NixOS tests, it will be + safer to use the nixos-* channels instead: + + $ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs - - You may want to throw in a nix-channel - --update for good measure. - - - - Install the NixOS installation tools: - - You'll need nixos-generate-config and - nixos-install and we'll throw in some man - pages and nixos-enter just in case you want - to chroot into your NixOS partition. They are installed by - default on NixOS, but you don't have NixOS yet.. - - $ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" - - - - The following 5 steps are only for installing NixOS to - another partition. For installing NixOS in place using - NIXOS_LUSTRATE, skip ahead. - - Prepare your target partition: - - At this point it is time to prepare your target partition. - Please refer to the partitioning, file-system creation, and - mounting steps of - - If you're about to install NixOS in place using - NIXOS_LUSTRATE there is nothing to do for - this step. - - - - Generate your NixOS configuration: - - $ sudo `which nixos-generate-config` --root /mnt - - You'll probably want to edit the configuration files. Refer - to the nixos-generate-config step in for more information. - - Consider setting up the NixOS bootloader to give you the - ability to boot on your existing Linux partition. For instance, - if you're using GRUB and your existing distribution is running - Ubuntu, you may want to add something like this to your - configuration.nix: - - + + You may want to throw in a nix-channel --update for good + measure. + + + + + Install the NixOS installation tools: + + + You'll need nixos-generate-config and + nixos-install and we'll throw in some man pages and + nixos-enter just in case you want to chroot into your + NixOS partition. They are installed by default on NixOS, but you don't have + NixOS yet.. + +$ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" + + + + + The following 5 steps are only for installing NixOS to another partition. + For installing NixOS in place using NIXOS_LUSTRATE, + skip ahead. + + + + Prepare your target partition: + + + At this point it is time to prepare your target partition. Please refer to + the partitioning, file-system creation, and mounting steps of + + + + If you're about to install NixOS in place using + NIXOS_LUSTRATE there is nothing to do for this step. + + + + + Generate your NixOS configuration: + +$ sudo `which nixos-generate-config` --root /mnt + + You'll probably want to edit the configuration files. Refer to the + nixos-generate-config step in + for more + information. + + + Consider setting up the NixOS bootloader to give you the ability to boot on + your existing Linux partition. For instance, if you're using GRUB and your + existing distribution is running Ubuntu, you may want to add something like + this to your configuration.nix: + + = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e configfile "($ubuntu)/boot/grub/grub.cfg" } ''; - - (You can find the appropriate UUID for your partition in - /dev/disk/by-uuid) - - - - Create the nixbld group and user on your - original distribution: - - + + (You can find the appropriate UUID for your partition in + /dev/disk/by-uuid) + + + + + Create the nixbld group and user on your original + distribution: + + $ sudo groupadd -g 30000 nixbld $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld - - - - Download/build/install NixOS: - - Once you complete this step, you might no longer be - able to boot on existing systems without the help of a - rescue USB drive or similar. - - $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt - - Again, please refer to the nixos-install - step in for more - information. - - That should be it for installation to another partition! - - - - Optionally, you may want to clean up your non-NixOS distribution: - - + + + + Download/build/install NixOS: + + + + Once you complete this step, you might no longer be able to boot on + existing systems without the help of a rescue USB drive or similar. + + +$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + + Again, please refer to the nixos-install step in + for more information. + + + That should be it for installation to another partition! + + + + + Optionally, you may want to clean up your non-NixOS distribution: + + $ sudo userdel nixbld $ sudo groupdel nixbld - - If you do not wish to keep the Nix package mananager - installed either, run something like sudo rm -rv - ~/.nix-* /nix and remove the line that the Nix - installer added to your ~/.profile. - - - - The following steps are only for installing NixOS in - place using - NIXOS_LUSTRATE: - - Generate your NixOS configuration: - - $ sudo `which nixos-generate-config` --root / - - Note that this will place the generated configuration files - in /etc/nixos. You'll probably want to edit - the configuration files. Refer to the - nixos-generate-config step in for more information. - - You'll likely want to set a root password for your first boot - using the configuration files because you won't have a chance - to enter a password until after you reboot. You can initalize - the root password to an empty one with this line: (and of course - don't forget to set one once you've rebooted or to lock the - account with sudo passwd -l root if you use - sudo) - - + + If you do not wish to keep the Nix package manager installed either, run + something like sudo rm -rv ~/.nix-* /nix and remove the + line that the Nix installer added to your ~/.profile. + + + + + + The following steps are only for installing NixOS in place using + NIXOS_LUSTRATE: + + + + Generate your NixOS configuration: + +$ sudo `which nixos-generate-config` --root / + + Note that this will place the generated configuration files in + /etc/nixos. You'll probably want to edit the + configuration files. Refer to the nixos-generate-config + step in for more + information. + + + You'll likely want to set a root password for your first boot using the + configuration files because you won't have a chance to enter a password + until after you reboot. You can initalize the root password to an empty one + with this line: (and of course don't forget to set one once you've rebooted + or to lock the account with sudo passwd -l root if you + use sudo) + + users.extraUsers.root.initialHashedPassword = ""; - - - - Build the NixOS closure and install it in the - system profile: - - $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system - - - - Change ownership of the /nix tree to root - (since your Nix install was probably single user): - - $ sudo chown -R 0.0 /nix - - - - Set up the /etc/NIXOS and - /etc/NIXOS_LUSTRATE files: - - /etc/NIXOS officializes that this is now a - NixOS partition (the bootup scripts require its presence). - - /etc/NIXOS_LUSTRATE tells the NixOS bootup - scripts to move everything that's in the - root partition to /old-root. This will move - your existing distribution out of the way in the very early - stages of the NixOS bootup. There are exceptions (we do need to - keep NixOS there after all), so the NixOS lustrate process will - not touch: - - - The /nix - directory - - The /boot - directory - - Any file or directory listed in - /etc/NIXOS_LUSTRATE (one per - line) - - - Support for NIXOS_LUSTRATE was added - in NixOS 16.09. The act of "lustrating" refers to the - wiping of the existing distribution. Creating - /etc/NIXOS_LUSTRATE can also be used on - NixOS to remove all mutable files from your root partition - (anything that's not in /nix or - /boot gets "lustrated" on the next - boot. - lustrate /ˈlʌstreɪt/ verb. - purify by expiatory sacrifice, ceremonial washing, or - some other ritual action. - - Let's create the files: - - + + + + Build the NixOS closure and install it in the system + profile: + +$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system + + + + Change ownership of the /nix tree to root (since your + Nix install was probably single user): + +$ sudo chown -R 0.0 /nix + + + + Set up the /etc/NIXOS and + /etc/NIXOS_LUSTRATE files: + + + /etc/NIXOS officializes that this is now a NixOS + partition (the bootup scripts require its presence). + + + /etc/NIXOS_LUSTRATE tells the NixOS bootup scripts to + move everything that's in the root partition to + /old-root. This will move your existing distribution out + of the way in the very early stages of the NixOS bootup. There are + exceptions (we do need to keep NixOS there after all), so the NixOS + lustrate process will not touch: + + + + + The /nix directory + + + + + The /boot directory + + + + + Any file or directory listed in /etc/NIXOS_LUSTRATE + (one per line) + + + + + + Support for NIXOS_LUSTRATE was added in NixOS 16.09. + The act of "lustrating" refers to the wiping of the existing distribution. + Creating /etc/NIXOS_LUSTRATE can also be used on NixOS + to remove all mutable files from your root partition (anything that's not + in /nix or /boot gets "lustrated" on + the next boot. + + + lustrate /ˈlʌstreɪt/ verb. + + + purify by expiatory sacrifice, ceremonial washing, or some other ritual + action. + + + + Let's create the files: + + $ sudo touch /etc/NIXOS $ sudo touch /etc/NIXOS_LUSTRATE - - Let's also make sure the NixOS configuration files are kept - once we reboot on NixOS: - - + + Let's also make sure the NixOS configuration files are kept once we reboot + on NixOS: + + $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE - - - - Finally, move the /boot directory of your - current distribution out of the way (the lustrate process will - take care of the rest once you reboot, but this one must be - moved out now because NixOS needs to install its own boot - files: - - Once you complete this step, your current - distribution will no longer be bootable! If you didn't get - all the NixOS configuration right, especially those - settings pertaining to boot loading and root partition, - NixOS may not be bootable either. Have a USB rescue device - ready in case this happens. - - + + + + Finally, move the /boot directory of your current + distribution out of the way (the lustrate process will take care of the + rest once you reboot, but this one must be moved out now because NixOS + needs to install its own boot files: + + + + Once you complete this step, your current distribution will no longer be + bootable! If you didn't get all the NixOS configuration right, especially + those settings pertaining to boot loading and root partition, NixOS may + not be bootable either. Have a USB rescue device ready in case this + happens. + + + $ sudo mv -v /boot /boot.bak && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - Cross your fingers, reboot, hopefully you should get a NixOS - prompt! - - - If for some reason you want to revert to the old - distribution, you'll need to boot on a USB rescue disk and do - something along these lines: - - + + Cross your fingers, reboot, hopefully you should get a NixOS prompt! + + + + + If for some reason you want to revert to the old distribution, you'll need + to boot on a USB rescue disk and do something along these lines: + + # mkdir root # mount /dev/sdaX root # mkdir root/nixos-root @@ -291,23 +332,25 @@ $ sudo mv -v /boot /boot.bak && # mv -v root/boot.bak root/boot # We had renamed this by hand earlier # umount root # reboot - - This may work as is or you might also need to reinstall the - boot loader - - And of course, if you're happy with NixOS and no longer need - the old distribution: - - sudo rm -rf /old-root - - - - It's also worth noting that this whole process can be - automated. This is especially useful for Cloud VMs, where - provider do not provide NixOS. For instance, + This may work as is or you might also need to reinstall the boot loader + + + And of course, if you're happy with NixOS and no longer need the old + distribution: + +sudo rm -rf /old-root + + + + It's also worth noting that this whole process can be automated. This is + especially useful for Cloud VMs, where provider do not provide NixOS. For + instance, + nixos-infect - uses the lustrate process to convert Digital Ocean droplets to - NixOS from other distributions automatically. - - + uses the lustrate process to convert Digital Ocean droplets to NixOS from + other distributions automatically. + + + diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml index 7b7597c91626..94199e5e028d 100644 --- a/nixos/doc/manual/installation/installing-pxe.xml +++ b/nixos/doc/manual/installation/installing-pxe.xml @@ -3,46 +3,48 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-booting-from-pxe"> + Booting from the <quote>netboot</quote> media (PXE) -Booting from the <quote>netboot</quote> media (PXE) - - Advanced users may wish to install NixOS using an existing PXE or - iPXE setup. - - + + Advanced users may wish to install NixOS using an existing PXE or iPXE setup. + + + These instructions assume that you have an existing PXE or iPXE - infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from a recent version of - nixpkgs, you can run: - + infrastructure and simply want to add the NixOS installer as another option. + To build the necessary files from a recent version of nixpkgs, you can run: + + nix-build -A netboot nixos/release.nix - - This will create a result directory containing: * - bzImage – the Linux kernel * - initrd – the initrd file * - netboot.ipxe – an example ipxe script - demonstrating the appropriate kernel command line arguments for this - image - - - If you’re using plain PXE, configure your boot loader to use the - bzImage and initrd files and - have it provide the same kernel command line arguments found in - netboot.ipxe. - - - If you’re using iPXE, depending on how your HTTP/FTP/etc. server is - configured you may be able to use netboot.ipxe - unmodified, or you may need to update the paths to the files to - match your server’s directory layout - - - In the future we may begin making these files available as build - products from hydra at which point we will update this documentation - with instructions on how to obtain them either for placing on a - dedicated TFTP server or to boot them directly over the internet. - + + This will create a result directory containing: * + bzImage – the Linux kernel * initrd + – the initrd file * netboot.ipxe – an example ipxe + script demonstrating the appropriate kernel command line arguments for this + image + + + + If you’re using plain PXE, configure your boot loader to use the + bzImage and initrd files and have it + provide the same kernel command line arguments found in + netboot.ipxe. + + + + If you’re using iPXE, depending on how your HTTP/FTP/etc. server is + configured you may be able to use netboot.ipxe unmodified, + or you may need to update the paths to the files to match your server’s + directory layout + + + + In the future we may begin making these files available as build products + from hydra at which point we will update this documentation with instructions + on how to obtain them either for placing on a dedicated TFTP server or to + boot them directly over the internet. + diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index d68cd6162632..c5934111749c 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -3,17 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-booting-from-usb"> + Booting from a USB Drive -Booting from a USB Drive + + For systems without CD drive, the NixOS live CD can be booted from a USB + stick. You can use the dd utility to write the image: + dd if=path-to-image + of=/dev/sdb. Be careful about specifying + the correct drive; you can use the lsblk command to get a + list of block devices. + -For systems without CD drive, the NixOS live CD can be booted from -a USB stick. You can use the dd utility to write the image: -dd if=path-to-image -of=/dev/sdb. Be careful about specifying the -correct drive; you can use the lsblk command to get a list of -block devices. - -On macOS: + + On macOS: $ diskutil list [..] @@ -24,36 +26,43 @@ $ diskutil unmountDisk diskN Unmount of all volumes on diskN was successful $ sudo dd bs=1m if=nix.iso of=/dev/rdiskN -Using the 'raw' rdiskN device instead of diskN -completes in minutes instead of hours. After dd completes, a GUI -dialog "The disk you inserted was not readable by this computer" will pop up, which -can be ignored. - -The dd utility will write the image verbatim to the drive, -making it the recommended option for both UEFI and non-UEFI installations. For -non-UEFI installations, you can alternatively use -unetbootin. If you -cannot use dd for a UEFI installation, you can also mount the -ISO, copy its contents verbatim to your drive, then either: - - - - Change the label of the disk partition to the label of the ISO - (visible with the blkid command), or - - - Edit loader/entries/nixos-livecd.conf on the drive - and change the root= field in the options - line to point to your drive (see the documentation on root= - in - the kernel documentation for more details). - - - If you want to load the contents of the ISO to ram after bootin - (So you can remove the stick after bootup) you can append the parameter - copytoram to the options field. - - - + Using the 'raw' rdiskN device instead of + diskN completes in minutes instead of hours. After + dd completes, a GUI dialog "The disk you inserted was not + readable by this computer" will pop up, which can be ignored. + + + The dd utility will write the image verbatim to the drive, + making it the recommended option for both UEFI and non-UEFI installations. + For non-UEFI installations, you can alternatively use + unetbootin. If + you cannot use dd for a UEFI installation, you can also + mount the ISO, copy its contents verbatim to your drive, then either: + + + + Change the label of the disk partition to the label of the ISO (visible + with the blkid command), or + + + + + Edit loader/entries/nixos-livecd.conf on the drive + and change the root= field in the + options line to point to your drive (see the + documentation on root= in + + the kernel documentation for more details). + + + + + If you want to load the contents of the ISO to ram after bootin (So you + can remove the stick after bootup) you can append the parameter + copytoram to the options field. + + + + diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 2b31b7ed3152..da78b480f5aa 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -3,63 +3,82 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-instaling-virtualbox-guest"> + Installing in a VirtualBox guest -Installing in a VirtualBox guest - + Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made - VirtualBox appliance, it is available at the downloads page. - If you want to set up a VirtualBox guest manually, follow these instructions: - + VirtualBox appliance, it is available at + the downloads + page. If you want to set up a VirtualBox guest manually, follow these + instructions: + - + + + + Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" + + + + + Base Memory Size: 768 MB or higher. + + + + + New Hard Disk of 8 GB or higher. + + + + + Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) + + + + + Click on Settings / System / Processor and enable PAE/NX + + + + + Click on Settings / System / Acceleration and enable "VT-x/AMD-V" + acceleration + + + + + Save the settings, start the virtual machine, and continue installation + like normal + + + - Add a New Machine in VirtualBox with OS Type "Linux / Other - Linux" - - Base Memory Size: 768 MB or higher. - - New Hard Disk of 8 GB or higher. - - Mount the CD-ROM with the NixOS ISO (by clicking on - CD/DVD-ROM) - - Click on Settings / System / Processor and enable - PAE/NX - - Click on Settings / System / Acceleration and enable - "VT-x/AMD-V" acceleration - - Save the settings, start the virtual machine, and continue - installation like normal - - - - - There are a few modifications you should make in configuration.nix. - Enable booting: - + + There are a few modifications you should make in configuration.nix. Enable + booting: + = "/dev/sda"; - + Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press *. - + = false; - + Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the /etc/nixos/configuration.nix to auto-mount them: - + { config, pkgs, ...} : @@ -74,8 +93,7 @@ } - + The folder will be available directly under the root directory. - - + diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 6b08bdb318bc..4e1fde662d6e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -3,66 +3,92 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-installation"> - -Installing NixOS - -NixOS can be installed on BIOS or UEFI systems. The procedure -for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow. - - - - Boot from the CD. - - UEFI systems - You should boot the live CD in UEFI mode - (consult your specific hardware's documentation for instructions). - You may find the rEFInd boot - manager useful. - - The CD contains a basic NixOS installation. (It - also contains Memtest86+, useful if you want to test new hardware). - When it’s finished booting, it should have detected most of your - hardware. - - The NixOS manual is available on virtual console 8 - (press Alt+F8 to access) or by running nixos-help. - - - You get logged in as root - (with empty password). - - If you downloaded the graphical ISO image, you can - run systemctl start display-manager to start KDE. If you - want to continue on the terminal, you can use - loadkeys to switch to your preferred keyboard layout. - (We even provide neo2 via loadkeys de neo!) - - The boot process should have brought up networking (check - ip a). Networking is necessary for the - installer, since it will download lots of stuff (such as source - tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP - server on your network. Otherwise configure networking manually - using ifconfig. - To manually configure the network on the graphical installer, - first disable network-manager with - systemctl stop network-manager. - To manually configure the wifi on the minimal installer, run - wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key'). - - - If you would like to continue the installation from a different - machine you need to activate the SSH daemon via systemctl start sshd. - In order to be able to login you also need to set a password for - root using passwd. - - The NixOS installer doesn’t do any partitioning or - formatting yet, so you need to do that yourself. Use the following - commands: - - - - For partitioning: - fdisk. + Installing NixOS + + NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI + installation is by and large the same as a BIOS installation. The differences + are mentioned in the steps that follow. + + + + + Boot from the CD. + + + + UEFI systems + + + You should boot the live CD in UEFI mode (consult your specific + hardware's documentation for instructions). You may find the + rEFInd boot + manager useful. + + + + + + + + The CD contains a basic NixOS installation. (It also contains Memtest86+, + useful if you want to test new hardware). When it’s finished booting, it + should have detected most of your hardware. + + + + + The NixOS manual is available on virtual console 8 (press Alt+F8 to access) + or by running nixos-help. + + + + + You get logged in as root (with empty password). + + + + + If you downloaded the graphical ISO image, you can run systemctl + start display-manager to start KDE. If you want to continue on + the terminal, you can use loadkeys to switch to your + preferred keyboard layout. (We even provide neo2 via loadkeys de + neo!) + + + + + The boot process should have brought up networking (check ip + a). Networking is necessary for the installer, since it will + download lots of stuff (such as source tarballs or Nixpkgs channel + binaries). It’s best if you have a DHCP server on your network. Otherwise + configure networking manually using ifconfig. + + + To manually configure the network on the graphical installer, first disable + network-manager with systemctl stop network-manager. + + + To manually configure the wifi on the minimal installer, run + wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' + 'key'). + + + + + If you would like to continue the installation from a different machine you + need to activate the SSH daemon via systemctl start + sshd. In order to be able to login you also need to set a + password for root using passwd. + + + + + The NixOS installer doesn’t do any partitioning or formatting yet, so you + need to do that yourself. Use the following commands: + + + + For partitioning: fdisk. # fdisk /dev/sda # (or whatever device you want to install on) -- for UEFI systems only @@ -86,257 +112,266 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif > x # (enter expert mode) > f # (fix up the partition ordering) > r # (exit expert mode) -> w # (write the partition table to disk and exit) - - For initialising Ext4 partitions: - mkfs.ext4. It is recommended that you assign a - unique symbolic label to the file system using the option - , since this - makes the file system configuration independent from device - changes. For example: - +> w # (write the partition table to disk and exit) + + + + + For initialising Ext4 partitions: mkfs.ext4. It is + recommended that you assign a unique symbolic label to the file system + using the option , + since this makes the file system configuration independent from device + changes. For example: # mkfs.ext4 -L nixos /dev/sda1 - - - - For creating swap partitions: - mkswap. Again it’s recommended to assign a - label to the swap partition: . For example: - + + + + + For creating swap partitions: mkswap. Again it’s + recommended to assign a label to the swap partition: . For example: # mkswap -L swap /dev/sda2 - - - - - - UEFI systems - For creating boot partitions: - mkfs.fat. Again it’s recommended to assign a - label to the boot partition: . For example: - + + + + + + UEFI systems + + + For creating boot partitions: mkfs.fat. Again + it’s recommended to assign a label to the boot partition: + . For example: # mkfs.fat -F 32 -n boot /dev/sda3 - - - - For creating LVM volumes, the LVM commands, e.g., - pvcreate, vgcreate, and - lvcreate. - - For creating software RAID devices, use - mdadm. - - - - - - Mount the target file system on which NixOS should - be installed on /mnt, e.g. - + + + + + + + + For creating LVM volumes, the LVM commands, e.g., + pvcreate, vgcreate, and + lvcreate. + + + + + For creating software RAID devices, use mdadm. + + + + + + + + Mount the target file system on which NixOS should be installed on + /mnt, e.g. # mount /dev/disk/by-label/nixos /mnt - - - + + - - UEFI systems - Mount the boot file system on /mnt/boot, e.g. - + + + UEFI systems + + + Mount the boot file system on /mnt/boot, e.g. # mkdir -p /mnt/boot # mount /dev/disk/by-label/boot /mnt/boot - - - - If your machine has a limited amount of memory, you - may want to activate swap devices now (swapon - device). The installer (or - rather, the build actions that it may spawn) may need quite a bit of - RAM, depending on your configuration. - + + + + + + + + If your machine has a limited amount of memory, you may want to activate + swap devices now (swapon + device). The installer (or rather, the + build actions that it may spawn) may need quite a bit of RAM, depending on + your configuration. # swapon /dev/sda2 - - - + + - - You now need to create a file - /mnt/etc/nixos/configuration.nix that - specifies the intended configuration of the system. This is - because NixOS has a declarative configuration - model: you create or edit a description of the desired - configuration of your system, and then NixOS takes care of making - it happen. The syntax of the NixOS configuration file is - described in , while a - list of available configuration options appears in . A minimal example is shown in . - - The command nixos-generate-config can - generate an initial configuration file for you: - + + You now need to create a file + /mnt/etc/nixos/configuration.nix that specifies the + intended configuration of the system. This is because NixOS has a + declarative configuration model: you create or edit a + description of the desired configuration of your system, and then NixOS + takes care of making it happen. The syntax of the NixOS configuration file + is described in , while a list of + available configuration options appears in + . A minimal example is shown in + . + + + The command nixos-generate-config can generate an + initial configuration file for you: # nixos-generate-config --root /mnt - - You should then edit - /mnt/etc/nixos/configuration.nix to suit your - needs: - + You should then edit /mnt/etc/nixos/configuration.nix + to suit your needs: # nano /mnt/etc/nixos/configuration.nix - - If you’re using the graphical ISO image, other editors may be - available (such as vim). If you have network - access, you can also install other editors — for instance, you can - install Emacs by running nix-env -i - emacs. - - - - BIOS systems - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. - - UEFI systems - You must set the option - to true. - nixos-generate-config should do this automatically for new - configurations when booted in - UEFI mode. - You may want to look at the options starting with - and - as well. - - - - - - - If there are other operating systems running on the machine before - installing NixOS, the - option can be set to - true to automatically add them to the grub menu. - - Another critical option is , - specifying the file systems that need to be mounted by NixOS. - However, you typically don’t need to set it yourself, because + If you’re using the graphical ISO image, other editors may be available + (such as vim). If you have network access, you can also + install other editors — for instance, you can install Emacs by running + nix-env -i emacs. + + + + BIOS systems + + + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot boot. + + + + + UEFI systems + + + You must set the option + to + true. nixos-generate-config should + do this automatically for new configurations when booted in UEFI mode. + + + You may want to look at the options starting with + + and + + as well. + + + + + + If there are other operating systems running on the machine before + installing NixOS, the + option can be set to true to automatically add them to + the grub menu. + + + Another critical option is , specifying the + file systems that need to be mounted by NixOS. However, you typically + don’t need to set it yourself, because nixos-generate-config sets it automatically in - /mnt/etc/nixos/hardware-configuration.nix - from your currently mounted file systems. (The configuration file + /mnt/etc/nixos/hardware-configuration.nix from your + currently mounted file systems. (The configuration file hardware-configuration.nix is included from - configuration.nix and will be overwritten by - future invocations of nixos-generate-config; - thus, you generally should not modify it.) - - Depending on your hardware configuration or type of - file system, you may need to set the option - to include the kernel - modules that are necessary for mounting the root file system, - otherwise the installed system will not be able to boot. (If this - happens, boot from the CD again, mount the target file system on - /mnt, fix - /mnt/etc/nixos/configuration.nix and rerun - nixos-install.) In most cases, - nixos-generate-config will figure out the - required modules. - + configuration.nix and will be overwritten by future + invocations of nixos-generate-config; thus, you + generally should not modify it.) + + + + Depending on your hardware configuration or type of file system, you may + need to set the option to + include the kernel modules that are necessary for mounting the root file + system, otherwise the installed system will not be able to boot. (If this + happens, boot from the CD again, mount the target file system on + /mnt, fix + /mnt/etc/nixos/configuration.nix and rerun + nixos-install.) In most cases, + nixos-generate-config will figure out the required + modules. + + - - Do the installation: - + + + Do the installation: # nixos-install - - Cross fingers. If this fails due to a temporary problem (such as - a network issue while downloading binaries from the NixOS binary - cache), you can just re-run nixos-install. - Otherwise, fix your configuration.nix and - then re-run nixos-install. - - As the last step, nixos-install will ask - you to set the password for the root user, e.g. - - + Cross fingers. If this fails due to a temporary problem (such as a network + issue while downloading binaries from the NixOS binary cache), you can just + re-run nixos-install. Otherwise, fix your + configuration.nix and then re-run + nixos-install. + + + As the last step, nixos-install will ask you to set the + password for the root user, e.g. + setting root password... Enter new UNIX password: *** Retype new UNIX password: *** - - - To prevent the password prompt, set = false; in - configuration.nix, which allows unattended installation - necessary in automation. - + + To prevent the password prompt, set + = false; in + configuration.nix, which allows unattended + installation necessary in automation. + - - - + - - If everything went well: - - + + If everything went well: + # reboot - - - + + - - You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see Changing Configuration ), a - new item is added to the menu. This allows you to easily roll back - to a previous configuration if something goes wrong. - - You should log in and change the root - password with passwd. - - You’ll probably want to create some user accounts as well, - which can be done with useradd: - + + You should now be able to boot into the installed NixOS. The GRUB boot menu + shows a list of available configurations (initially + just one). Every time you change the NixOS configuration (see + Changing Configuration + ), a new item is added to the menu. This allows you to easily roll back to + a previous configuration if something goes wrong. + + + You should log in and change the root password with + passwd. + + + You’ll probably want to create some user accounts as well, which can be + done with useradd: $ useradd -c 'Eelco Dolstra' -m eelco $ passwd eelco - - - - You may also want to install some software. For instance, - + + + You may also want to install some software. For instance, $ nix-env -qa \* - shows what packages are available, and - $ nix-env -i w3m - - install the w3m browser. - + install the w3m browser. + - - - -To summarise, shows a -typical sequence of commands for installing NixOS on an empty hard -drive (here /dev/sda). shows a corresponding configuration Nix expression. - -Commands for Installing NixOS on <filename>/dev/sda</filename> + + + To summarise, shows a typical sequence + of commands for installing NixOS on an empty hard drive (here + /dev/sda). shows a + corresponding configuration Nix expression. + + + Commands for Installing NixOS on <filename>/dev/sda</filename> # fdisk /dev/sda # (or whatever device you want to install on) -- for UEFI systems only @@ -372,10 +407,10 @@ drive (here /dev/sda). - - -NixOS Configuration - + + + NixOS Configuration + { config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. @@ -394,11 +429,9 @@ drive (here /dev/sda). - - - - - - - + + + + + diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 9b2b474c60ce..56af5c0e25a0 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -3,46 +3,52 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-obtaining"> - -Obtaining NixOS - -NixOS ISO images can be downloaded from the NixOS -download page. There are a number of installation options. If -you happen to have an optical drive and a spare CD, burning the -image to CD and booting from that is probably the easiest option. -Most people will need to prepare a USB stick to boot from. - describes the preferred method -to prepare a USB stick. -A number of alternative methods are presented in the Obtaining NixOS + + NixOS ISO images can be downloaded from the + NixOS download + page. There are a number of installation options. If you happen to + have an optical drive and a spare CD, burning the image to CD and booting + from that is probably the easiest option. Most people will need to prepare a + USB stick to boot from. describes the + preferred method to prepare a USB stick. A number of alternative methods are + presented in the + NixOS -Wiki. - -As an alternative to installing NixOS yourself, you can get a -running NixOS system through several other means: - - - - Using virtual appliances in Open Virtualization Format (OVF) - that can be imported into VirtualBox. These are available from - the NixOS - download page. - - - Using AMIs for Amazon’s EC2. To find one for your region - and instance type, please refer to the . + + + As an alternative to installing NixOS yourself, you can get a running NixOS + system through several other means: + + + + Using virtual appliances in Open Virtualization Format (OVF) that can be + imported into VirtualBox. These are available from the + NixOS download + page. + + + + + Using AMIs for Amazon’s EC2. To find one for your region and instance + type, please refer to the + list - of most recent AMIs. - - - Using NixOps, the NixOS-based cloud deployment tool, which - allows you to provision VirtualBox and EC2 NixOS instances from - declarative specifications. Check out the . + + + + + Using NixOps, the NixOS-based cloud deployment tool, which allows you to + provision VirtualBox and EC2 NixOS instances from declarative + specifications. Check out the + NixOps homepage for - details. - - - - - + details. + + + + diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 24881c8fec0f..20355812ec63 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -2,140 +2,130 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="sec-upgrading"> - -Upgrading NixOS - -The best way to keep your NixOS installation up to date is to -use one of the NixOS channels. A channel is a -Nix mechanism for distributing Nix expressions and associated -binaries. The NixOS channels are updated automatically from NixOS’s -Git repository after certain tests have passed and all packages have -been built. These channels are: - - - - Stable channels, such as Upgrading NixOS + + The best way to keep your NixOS installation up to date is to use one of the + NixOS channels. A channel is a Nix mechanism for + distributing Nix expressions and associated binaries. The NixOS channels are + updated automatically from NixOS’s Git repository after certain tests have + passed and all packages have been built. These channels are: + + + + Stable channels, such as + nixos-17.03. - These only get conservative bug fixes and package upgrades. For - instance, a channel update may cause the Linux kernel on your - system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but - not from 4.9.x to - 4.11.x (a major change that has the - potential to break things). Stable channels are generally - maintained until the next stable branch is created. + These only get conservative bug fixes and package upgrades. For instance, + a channel update may cause the Linux kernel on your system to be upgraded + from 4.9.16 to 4.9.17 (a minor bug fix), but not from + 4.9.x to 4.11.x (a + major change that has the potential to break things). Stable channels are + generally maintained until the next stable branch is created. + - - - The unstable channel, + + + The unstable channel, + nixos-unstable. - This corresponds to NixOS’s main development branch, and may thus - see radical changes between channel updates. It’s not recommended - for production systems. - - - Small channels, such as + + + + Small channels, such as + nixos-17.03-small - or nixos-unstable-small. These - are identical to the stable and unstable channels described above, - except that they contain fewer binary packages. This means they - get updated faster than the regular channels (for instance, when a - critical security patch is committed to NixOS’s source tree), but - may require more packages to be built from source than - usual. They’re mostly intended for server environments and as such - contain few GUI applications. - - - -To see what channels are available, go to . (Note that the URIs of the -various channels redirect to a directory that contains the channel’s -latest version and includes ISO images and VirtualBox -appliances.) - -When you first install NixOS, you’re automatically subscribed to -the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 17.03 ISO, you will be subscribed to -the nixos-17.03 channel. To see which NixOS -channel you’re subscribed to, run the following as root: - + or + nixos-unstable-small. + These are identical to the stable and unstable channels described above, + except that they contain fewer binary packages. This means they get + updated faster than the regular channels (for instance, when a critical + security patch is committed to NixOS’s source tree), but may require + more packages to be built from source than usual. They’re mostly + intended for server environments and as such contain few GUI applications. + + + + To see what channels are available, go to + . (Note that the URIs of the + various channels redirect to a directory that contains the channel’s latest + version and includes ISO images and VirtualBox appliances.) + + + When you first install NixOS, you’re automatically subscribed to the NixOS + channel that corresponds to your installation source. For instance, if you + installed from a 17.03 ISO, you will be subscribed to the + nixos-17.03 channel. To see which NixOS channel you’re + subscribed to, run the following as root: # nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable - -To switch to a different NixOS channel, do - + To switch to a different NixOS channel, do # nix-channel --add https://nixos.org/channels/channel-name nixos - -(Be sure to include the nixos parameter at the -end.) For instance, to use the NixOS 17.03 stable channel: - + (Be sure to include the nixos parameter at the end.) For + instance, to use the NixOS 17.03 stable channel: # nix-channel --add https://nixos.org/channels/nixos-17.03 nixos - -If you have a server, you may want to use the “small” channel instead: - + If you have a server, you may want to use the “small” channel instead: # nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos - -And if you want to live on the bleeding edge: - + And if you want to live on the bleeding edge: # nix-channel --add https://nixos.org/channels/nixos-unstable nixos - - - -You can then upgrade NixOS to the latest version in your chosen -channel by running - + + + You can then upgrade NixOS to the latest version in your chosen channel by + running # nixos-rebuild switch --upgrade + which is equivalent to the more verbose nix-channel --update nixos; + nixos-rebuild switch. + + + + Channels are set per user. This means that running nix-channel + --add as a non root user (or without sudo) will not affect + configuration in /etc/nixos/configuration.nix + + + + + It is generally safe to switch back and forth between channels. The only + exception is that a newer NixOS may also have a newer Nix version, which may + involve an upgrade of Nix’s database schema. This cannot be undone easily, + so in that case you will not be able to go back to your original channel. + + +
+ Automatic Upgrades -which is equivalent to the more verbose nix-channel --update -nixos; nixos-rebuild switch. - -Channels are set per user. This means that running -nix-channel --add as a non root user (or without sudo) will not -affect configuration in /etc/nixos/configuration.nix - - -It is generally safe to switch back and forth between -channels. The only exception is that a newer NixOS may also have a -newer Nix version, which may involve an upgrade of Nix’s database -schema. This cannot be undone easily, so in that case you will not be -able to go back to your original channel. - - -
Automatic Upgrades - -You can keep a NixOS system up-to-date automatically by adding -the following to configuration.nix: - + + You can keep a NixOS system up-to-date automatically by adding the following + to configuration.nix: = true; - -This enables a periodically executed systemd service named -nixos-upgrade.service. It runs -nixos-rebuild switch --upgrade to upgrade NixOS to -the latest version in the current channel. (To see when the service -runs, see systemctl list-timers.) You can also -specify a channel explicitly, e.g. - + This enables a periodically executed systemd service named + nixos-upgrade.service. It runs nixos-rebuild + switch --upgrade to upgrade NixOS to the latest version in the + current channel. (To see when the service runs, see systemctl + list-timers.) You can also specify a channel explicitly, e.g. = https://nixos.org/channels/nixos-17.03; - - - -
- - + +
diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index 37ffb9d648a9..9f30b7925101 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -1,39 +1,31 @@ - - - configuration.nix - 5 + + configuration.nix + 5 NixOS - - - - - configuration.nix - NixOS system configuration specification - - - -Description - -The file /etc/nixos/configuration.nix -contains the declarative specification of your NixOS system -configuration. The command nixos-rebuild takes -this file and realises the system configuration specified -therein. - - - - -Options - -You can use the following options in -configuration.nix. - - --> + + + configuration.nix + NixOS system configuration specification + + + Description + + The file /etc/nixos/configuration.nix contains the + declarative specification of your NixOS system configuration. The command + nixos-rebuild takes this file and realises the system + configuration specified therein. + + + + Options + + You can use the following options in configuration.nix. + + - - - + diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index f4b59a7c6d4b..02dad4c548b8 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -1,40 +1,39 @@ - - - nixos-build-vms - 8 + + nixos-build-vms + 8 NixOS - - - - - nixos-build-vms - build a network of virtual machines from a network of NixOS configurations - - - - - nixos-build-vms - - - - network.nix + + + + nixos-build-vms + build a network of virtual machines from a network of NixOS configurations + + + nixos-build-vms + + + + + + + network.nix + - - -Description - -This command builds a network of QEMU-KVM virtual machines of a Nix expression -specifying a network of NixOS machines. The virtual network can be started by -executing the bin/run-vms shell script that is generated by -this command. By default, a result symlink is produced that -points to the generated virtual network. - - -A network Nix expression has the following structure: - + + + Description + + This command builds a network of QEMU-KVM virtual machines of a Nix + expression specifying a network of NixOS machines. The virtual network can + be started by executing the bin/run-vms shell script + that is generated by this command. By default, a result + symlink is produced that points to the generated virtual network. + + + A network Nix expression has the following structure: { test1 = {pkgs, config, ...}: @@ -58,53 +57,53 @@ points to the generated virtual network. }; } - -Each attribute in the expression represents a machine in the network -(e.g. test1 and test2) -referring to a function defining a NixOS configuration. -In each NixOS configuration, two attributes have a special meaning. -The deployment.targetHost specifies the address -(domain name or IP address) -of the system which is used by ssh to perform -remote deployment operations. The nixpkgs.localSystem.system -attribute can be used to specify an architecture for the target machine, -such as i686-linux which builds a 32-bit NixOS -configuration. Omitting this property will build the configuration -for the same architecture as the host system. - - - - -Options - -This command accepts the following options: - - - - - + Each attribute in the expression represents a machine in the network (e.g. + test1 and test2) referring to a + function defining a NixOS configuration. In each NixOS configuration, two + attributes have a special meaning. The + deployment.targetHost specifies the address (domain name + or IP address) of the system which is used by ssh to + perform remote deployment operations. The + nixpkgs.localSystem.system attribute can be used to + specify an architecture for the target machine, such as + i686-linux which builds a 32-bit NixOS configuration. + Omitting this property will build the configuration for the same + architecture as the host system. + + + + Options + + This command accepts the following options: + + + + + - Shows a trace of the output. + + Shows a trace of the output. + - - - - + + + + - Do not create a 'result' symlink. + + Do not create a 'result' symlink. + - - - - , + + + , + - Shows the usage of this command to the user. + + Shows the usage of this command to the user. + - - - - - - - + + + diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index a2fbe07961db..7db4b72ee36e 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -1,119 +1,119 @@ - - - nixos-enter - 8 + + nixos-enter + 8 NixOS - - - - - nixos-enter - run a command in a NixOS chroot environment - - - - - nixos-enter - - - root - - - - system - - - - shell-command - - - - - - - arguments + + + + nixos-enter + run a command in a NixOS chroot environment + + + nixos-enter + + + root + + + + system + + + + shell-command + + + + + + + arguments + - - - -Description - -This command runs a command in a NixOS chroot environment, that -is, in a filesystem hierarchy previously prepared using -nixos-install. - - - -Options - -This command accepts the following options: - - - - - + + + Description + + This command runs a command in a NixOS chroot environment, that is, in a + filesystem hierarchy previously prepared using + nixos-install. + + + + Options + + This command accepts the following options: + + + + + - The path to the NixOS system you want to enter. It defaults to /mnt. + + The path to the NixOS system you want to enter. It defaults to + /mnt. + - - - - + + + + - The NixOS system configuration to use. It defaults to - /nix/var/nix/profiles/system. You can enter - a previous NixOS configuration by specifying a path such as - /nix/var/nix/profiles/system-106-link. + + The NixOS system configuration to use. It defaults to + /nix/var/nix/profiles/system. You can enter a + previous NixOS configuration by specifying a path such as + /nix/var/nix/profiles/system-106-link. + - - - - - + + + + + + - The bash command to execute. + + The bash command to execute. + - - - - - - Interpret the remaining arguments as the program - name and arguments to be invoked. The program is not executed in a - shell. - - - - - - - - -Examples - -Start an interactive shell in the NixOS installation in -/mnt: - + + + + + + + Interpret the remaining arguments as the program name and arguments to be + invoked. The program is not executed in a shell. + + + + + + + Examples + + Start an interactive shell in the NixOS installation in + /mnt: + # nixos-enter /mnt - -Run a shell command: - + + Run a shell command: + # nixos-enter -c 'ls -l /; cat /proc/mounts' - -Run a non-shell command: - + + Run a non-shell command: + # nixos-enter -- cat /proc/mounts - - - + diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 993a932ddfbe..8bf90f452db6 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -1,152 +1,149 @@ - - - nixos-generate-config - 8 + + nixos-generate-config + 8 NixOS - - - - - nixos-generate-config - generate NixOS configuration modules - - - - - nixos-generate-config - - - - root - - - - dir - + + + + nixos-generate-config + generate NixOS configuration modules + + + nixos-generate-config + + + + + root + + + + dir + - - - -Description - -This command writes two NixOS configuration modules: - - - - - + + + Description + + This command writes two NixOS configuration modules: + + + + + + + This module sets NixOS configuration options based on your current + hardware configuration. In particular, it sets the + option to reflect all currently mounted file + systems, the option to reflect active swap + devices, and the options to ensure that + the initial ramdisk contains any kernel modules necessary for mounting + the root file system. + + + If this file already exists, it is overwritten. Thus, you should not + modify it manually. Rather, you should include it from your + /etc/nixos/configuration.nix, and re-run + nixos-generate-config to update it whenever your + hardware configuration changes. + + + + + + + + + This is the main NixOS system configuration module. If it already + exists, it’s left unchanged. Otherwise, + nixos-generate-config will write a template for you + to customise. + + + + + + + + Options + + This command accepts the following options: + + + + + - This module sets NixOS configuration options based on your - current hardware configuration. In particular, it sets the - option to reflect all currently - mounted file systems, the option to - reflect active swap devices, and the - options to ensure that the - initial ramdisk contains any kernel modules necessary for - mounting the root file system. - - If this file already exists, it is overwritten. Thus, you - should not modify it manually. Rather, you should include it - from your /etc/nixos/configuration.nix, and - re-run nixos-generate-config to update it - whenever your hardware configuration changes. + + If this option is given, treat the directory + root as the root of the file system. This + means that configuration files will be written to + root/etc/nixos, and that + any file systems outside of root are ignored + for the purpose of generating the option. + - - - - + + + + - This is the main NixOS system configuration module. If it - already exists, it’s left unchanged. Otherwise, - nixos-generate-config will write a template - for you to customise. + + If this option is given, write the configuration files to the directory + dir instead of + /etc/nixos. + - - - - - - - - - -Options - -This command accepts the following options: - - - - - + + + + - If this option is given, treat the directory - root as the root of the file system. - This means that configuration files will be written to - root/etc/nixos, - and that any file systems outside of - root are ignored for the purpose of - generating the option. + + Overwrite /etc/nixos/configuration.nix if it already + exists. + - - - - + + + + - If this option is given, write the configuration files to - the directory dir instead of - /etc/nixos. + + Omit everything concerning file systems and swap devices from the + hardware configuration. + - - - - + + + + - Overwrite - /etc/nixos/configuration.nix if it already - exists. + + Don't generate configuration.nix or + hardware-configuration.nix and print the hardware + configuration to stdout only. + - - - - - - Omit everything concerning file systems and swap devices - from the hardware configuration. - - - - - - - Don't generate configuration.nix or - hardware-configuration.nix and print the - hardware configuration to stdout only. - - - - - - - - -Examples - -This command is typically used during NixOS installation to -write initial configuration modules. For example, if you created and -mounted the target file systems on /mnt and -/mnt/boot, you would run: - + + + + + Examples + + This command is typically used during NixOS installation to write initial + configuration modules. For example, if you created and mounted the target + file systems on /mnt and + /mnt/boot, you would run: $ nixos-generate-config --root /mnt - -The resulting file -/mnt/etc/nixos/hardware-configuration.nix might -look like this: - + The resulting file + /mnt/etc/nixos/hardware-configuration.nix might look + like this: # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes @@ -181,28 +178,22 @@ look like this: nix.maxJobs = 8; } - -It will also create a basic -/mnt/etc/nixos/configuration.nix, which you -should edit to customise the logical configuration of your system. -This file includes the result of the hardware scan as follows: - + It will also create a basic + /mnt/etc/nixos/configuration.nix, which you should edit + to customise the logical configuration of your system. This file includes + the result of the hardware scan as follows: imports = [ ./hardware-configuration.nix ]; - - -After installation, if your hardware configuration changes, you -can run: - + + + After installation, if your hardware configuration changes, you can run: $ nixos-generate-config - -to update /etc/nixos/hardware-configuration.nix. -Your /etc/nixos/configuration.nix will -not be overwritten. - - - + to update /etc/nixos/hardware-configuration.nix. Your + /etc/nixos/configuration.nix will + not be overwritten. + + diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index d6e70d16098b..2d45e83a863f 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -1,201 +1,221 @@ - - - nixos-install - 8 + + nixos-install + 8 NixOS - - - - - nixos-install - install bootloader and NixOS - - - - - nixos-install - - - path + + + + nixos-install + install bootloader and NixOS + + + nixos-install + + + path + + + + root + + + + path + + + - - - root + + + - - - path + + + - - + + + - - + + number + + number + + namevalue + + + - - - - - - - - - number - - - - number - - - - name - value - - - - - - + + + + - - - -Description - -This command installs NixOS in the file system mounted on -/mnt, based on the NixOS configuration specified -in /mnt/etc/nixos/configuration.nix. It performs -the following steps: - - - - It copies Nix and its dependencies to - /mnt/nix/store. - - It runs Nix in /mnt to build - the NixOS configuration specified in - /mnt/etc/nixos/configuration.nix. - - It installs the GRUB boot loader on the device - specified in the option - (unless is specified), - and generates a GRUB configuration file that boots into the NixOS - configuration just installed. - - It prompts you for a password for the root account - (unless is specified). - - - - - -This command is idempotent: if it is interrupted or fails due to -a temporary problem (e.g. a network issue), you can safely re-run -it. - - - -Options - -This command accepts the following options: - - - - - + + + Description + + This command installs NixOS in the file system mounted on + /mnt, based on the NixOS configuration specified in + /mnt/etc/nixos/configuration.nix. It performs the + following steps: + - Defaults to /mnt. If this option is given, treat the directory - root as the root of the NixOS installation. - + + It copies Nix and its dependencies to + /mnt/nix/store. + - - - - - If this option is provided, nixos-install will install the specified closure - rather than attempt to build one from /mnt/etc/nixos/configuration.nix. - - The closure must be an appropriately configured NixOS system, with boot loader and partition - configuration that fits the target host. Such a closure is typically obtained with a command such as - nix-build -I nixos-config=./configuration.nix '<nixos>' -A system --no-out-link - + + It runs Nix in /mnt to build the NixOS configuration + specified in /mnt/etc/nixos/configuration.nix. + - - - - - Add a path to the Nix expression search path. This option may be given multiple times. - See the NIX_PATH environment variable for information on the semantics of the Nix search path. - Paths added through -I take precedence over NIX_PATH. + + It installs the GRUB boot loader on the device specified in the option + (unless + is specified), and generates a GRUB + configuration file that boots into the NixOS configuration just + installed. + - - - - - - Sets the maximum number of build jobs that Nix will - perform in parallel to the specified number. The default is 1. - A higher value is useful on SMP systems or to exploit I/O latency. - - - - - - - Sets the value of the NIX_BUILD_CORES - environment variable in the invocation of builders. Builders can - use this variable at their discretion to control the maximum amount - of parallelism. For instance, in Nixpkgs, if the derivation - attribute enableParallelBuilding is set to - true, the builder passes the - flag to GNU Make. - The value 0 means that the builder should use all - available CPU cores in the system. - - - - name value - - Set the Nix configuration option - name to value. - - - - - - Causes Nix to print out a stack trace in case of Nix expression evaluation errors. + + It prompts you for a password for the root account (unless + is specified). + - - - - + + + + This command is idempotent: if it is interrupted or fails due to a temporary + problem (e.g. a network issue), you can safely re-run it. + + + + Options + + This command accepts the following options: + + + + + - Synonym for man nixos-install. + + Defaults to /mnt. If this option is given, treat the + directory root as the root of the NixOS + installation. + - - - - - - - -Examples - -A typical NixOS installation is done by creating and mounting a -file system on /mnt, generating a NixOS -configuration in -/mnt/etc/nixos/configuration.nix, and running -nixos-install. For instance, if we want to install -NixOS on an ext4 file system created in -/dev/sda1: - + + + + + + + If this option is provided, nixos-install will install + the specified closure rather than attempt to build one from + /mnt/etc/nixos/configuration.nix. + + + The closure must be an appropriately configured NixOS system, with boot + loader and partition configuration that fits the target host. Such a + closure is typically obtained with a command such as nix-build + -I nixos-config=./configuration.nix '<nixos>' -A system + --no-out-link + + + + + + + + + Add a path to the Nix expression search path. This option may be given + multiple times. See the NIX_PATH environment variable for information on + the semantics of the Nix search path. Paths added through + -I take precedence over NIX_PATH. + + + + + + + + + + + Sets the maximum number of build jobs that Nix will perform in parallel + to the specified number. The default is 1. A higher + value is useful on SMP systems or to exploit I/O latency. + + + + + + + + + Sets the value of the NIX_BUILD_CORES environment variable + in the invocation of builders. Builders can use this variable at their + discretion to control the maximum amount of parallelism. For instance, in + Nixpkgs, if the derivation attribute + enableParallelBuilding is set to + true, the builder passes the + flag to GNU Make. The + value 0 means that the builder should use all + available CPU cores in the system. + + + + + namevalue + + + + Set the Nix configuration option name to + value. + + + + + + + + + Causes Nix to print out a stack trace in case of Nix expression + evaluation errors. + + + + + + + + + Synonym for man nixos-install. + + + + + + + Examples + + A typical NixOS installation is done by creating and mounting a file system + on /mnt, generating a NixOS configuration in + /mnt/etc/nixos/configuration.nix, and running + nixos-install. For instance, if we want to install NixOS + on an ext4 file system created in + /dev/sda1: $ mkfs.ext4 /dev/sda1 $ mount /dev/sda1 /mnt @@ -204,9 +224,6 @@ $ # edit /mnt/etc/nixos/configuration.nix $ nixos-install $ reboot - - - - - + + diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index d2b2d5b7965c..c22c3811dedf 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -1,103 +1,96 @@ - - - nixos-option - 8 + + nixos-option + 8 NixOS - - - - - nixos-option - inspect a NixOS configuration - - - - - nixos-option - - - path - - - - option.name + + + + nixos-option + inspect a NixOS configuration + + + nixos-option + path + + + + + + option.name + - - -Description - -This command evaluates the configuration specified in -/etc/nixos/configuration.nix and returns the properties -of the option name given as argument. - -When the option name is not an option, the command prints the list of -attributes contained in the attribute set. - - - -Options - -This command accepts the following options: - - - - - path + + + Description + + This command evaluates the configuration specified in + /etc/nixos/configuration.nix and returns the properties + of the option name given as argument. + + + When the option name is not an option, the command prints the list of + attributes contained in the attribute set. + + + + Options + + This command accepts the following options: + + + + path + - - This option is passed to the underlying - nix-instantiate invocation. - + + This option is passed to the underlying + nix-instantiate invocation. + - - - - + + + + - - This option enables verbose mode, which currently is just - the Bash set debug mode. - + + This option enables verbose mode, which currently is just the Bash + set debug mode. + - - - - + + + + - - This option causes the output to be rendered as XML. - + + This option causes the output to be rendered as XML. + - - - - - - -Environment - - - - - NIXOS_CONFIG + + + + + Environment + + + NIXOS_CONFIG + - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. + + Path to the main NixOS configuration module. Defaults to + /etc/nixos/configuration.nix. + - - - - - - - -Examples - -Investigate option values: - + + + + + Examples + + Investigate option values: $ nixos-option boot.loader This attribute set contains: generationsDir @@ -119,16 +112,14 @@ Declared by: Defined by: "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - - - - -Bugs - -The author listed in the following section is wrong. If there is any - other bug, please report to Nicolas Pierron. - - - - + + + + + Bugs + + The author listed in the following section is wrong. If there is any other + bug, please report to Nicolas Pierron. + + diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index f74788353e67..e1a2c7108d18 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -1,399 +1,415 @@ - - - nixos-rebuild - 8 + + nixos-rebuild + 8 NixOS - - - - - nixos-rebuild - reconfigure a NixOS machine - - - - - nixos-rebuild - - - - - - - - - - - - - - - - - - - - - - - name + + + + nixos-rebuild + reconfigure a NixOS machine + + + nixos-rebuild + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + name + + + + - - - -Description - -This command updates the system so that it corresponds to the -configuration specified in -/etc/nixos/configuration.nix. Thus, every time -you modify /etc/nixos/configuration.nix or any -NixOS module, you must run nixos-rebuild to make -the changes take effect. It builds the new system in -/nix/store, runs its activation script, and stop -and (re)starts any system services if needed. - -This command has one required argument, which specifies the -desired operation. It must be one of the following: - - - - - - - Build and activate the new configuration, and make it the - boot default. That is, the configuration is added to the GRUB - boot menu as the default menu entry, so that subsequent reboots - will boot the system into the new configuration. Previous - configurations activated with nixos-rebuild - switch or nixos-rebuild boot remain - available in the GRUB menu. - - - - - - - Build the new configuration and make it the boot default - (as with nixos-rebuild switch), but do not - activate it. That is, the system continues to run the previous - configuration until the next reboot. - - - - - - - Build and activate the new configuration, but do not add - it to the GRUB boot menu. Thus, if you reboot the system (or if - it crashes), you will automatically revert to the default - configuration (i.e. the configuration resulting from the last - call to nixos-rebuild switch or - nixos-rebuild boot). - - - - - - - Build the new configuration, but neither activate it nor - add it to the GRUB boot menu. It leaves a symlink named - result in the current directory, which - points to the output of the top-level “system” derivation. This - is essentially the same as doing + + + Description + + This command updates the system so that it corresponds to the configuration + specified in /etc/nixos/configuration.nix. Thus, every + time you modify /etc/nixos/configuration.nix or any + NixOS module, you must run nixos-rebuild to make the + changes take effect. It builds the new system in + /nix/store, runs its activation script, and stop and + (re)starts any system services if needed. + + + This command has one required argument, which specifies the desired + operation. It must be one of the following: + + + + + + + Build and activate the new configuration, and make it the boot default. + That is, the configuration is added to the GRUB boot menu as the default + menu entry, so that subsequent reboots will boot the system into the new + configuration. Previous configurations activated with + nixos-rebuild switch or nixos-rebuild + boot remain available in the GRUB menu. + + + + + + + + + Build the new configuration and make it the boot default (as with + nixos-rebuild switch), but do not activate it. That + is, the system continues to run the previous configuration until the + next reboot. + + + + + + + + + Build and activate the new configuration, but do not add it to the GRUB + boot menu. Thus, if you reboot the system (or if it crashes), you will + automatically revert to the default configuration (i.e. the + configuration resulting from the last call to nixos-rebuild + switch or nixos-rebuild boot). + + + + + + + + + Build the new configuration, but neither activate it nor add it to the + GRUB boot menu. It leaves a symlink named result in + the current directory, which points to the output of the top-level + “system” derivation. This is essentially the same as doing $ nix-build /path/to/nixpkgs/nixos -A system - Note that you do not need to be root to run - nixos-rebuild build. - - - - - - - Show what store paths would be built or downloaded by any - of the operations above, but otherwise do nothing. - - - - - - - Build the new configuration, but instead of activating it, - show what changes would be performed by the activation (i.e. by - nixos-rebuild test). For - instance, this command will print which systemd units would be - restarted. The list of changes is not guaranteed to be - complete. - - - - - - - Build a script that starts a NixOS virtual machine with - the desired configuration. It leaves a symlink - result in the current directory that points - (under - result/bin/run-hostname-vm) - at the script that starts the VM. Thus, to test a NixOS - configuration in a virtual machine, you should do the following: + Note that you do not need to be root to run + nixos-rebuild build. + + + + + + + + + Show what store paths would be built or downloaded by any of the + operations above, but otherwise do nothing. + + + + + + + + + Build the new configuration, but instead of activating it, show what + changes would be performed by the activation (i.e. by + nixos-rebuild test). For instance, this command will + print which systemd units would be restarted. The list of changes is not + guaranteed to be complete. + + + + + + + + + Build a script that starts a NixOS virtual machine with the desired + configuration. It leaves a symlink result in the + current directory that points (under + result/bin/run-hostname-vm) + at the script that starts the VM. Thus, to test a NixOS configuration in + a virtual machine, you should do the following: $ nixos-rebuild build-vm $ ./result/bin/run-*-vm - - - The VM is implemented using the qemu - package. For best performance, you should load the - kvm-intel or kvm-amd - kernel modules to get hardware virtualisation. - - The VM mounts the Nix store of the host through the 9P - file system. The host Nix store is read-only, so Nix commands - that modify the Nix store will not work in the VM. This - includes commands such as nixos-rebuild; to - change the VM’s configuration, you must halt the VM and re-run - the commands above. + - - The VM has its own ext3 root file - system, which is automatically created when the VM is first - started, and is persistent across reboots of the VM. It is - stored in - ./hostname.qcow2. - - - - - - - - Like , but boots using the - regular boot loader of your configuration (e.g., GRUB 1 or 2), - rather than booting directly into the kernel and initial ramdisk - of the system. This allows you to test whether the boot loader - works correctly. However, it does not guarantee that your NixOS - configuration will boot successfully on the host hardware (i.e., - after running nixos-rebuild switch), because - the hardware and boot loader configuration in the VM are - different. The boot loader is installed on an automatically - generated virtual disk containing a /boot - partition, which is mounted read-only in the VM. - - - - - - - - - - - -Options - -This command accepts the following options: - - - - - - - Fetch the latest version of NixOS from the NixOS - channel. - - - - - - - Causes the boot loader to be (re)installed on the - device specified by the relevant configuration options. + + The VM is implemented using the qemu package. For + best performance, you should load the kvm-intel or + kvm-amd kernel modules to get hardware + virtualisation. - - - - - + + The VM mounts the Nix store of the host through the 9P file system. The + host Nix store is read-only, so Nix commands that modify the Nix store + will not work in the VM. This includes commands such as + nixos-rebuild; to change the VM’s configuration, + you must halt the VM and re-run the commands above. + + + The VM has its own ext3 root file system, which is + automatically created when the VM is first started, and is persistent + across reboots of the VM. It is stored in + ./hostname.qcow2. + + + + + + + + + + Like , but boots using the regular boot loader + of your configuration (e.g., GRUB 1 or 2), rather than booting directly + into the kernel and initial ramdisk of the system. This allows you to + test whether the boot loader works correctly. However, it does not + guarantee that your NixOS configuration will boot successfully on the + host hardware (i.e., after running nixos-rebuild + switch), because the hardware and boot loader configuration in + the VM are different. The boot loader is installed on an automatically + generated virtual disk containing a /boot + partition, which is mounted read-only in the VM. + + + + + + + + Options + + This command accepts the following options: + + + + + - Normally, nixos-rebuild first builds - the nixUnstable attribute in Nixpkgs, and - uses the resulting instance of the Nix package manager to build - the new system configuration. This is necessary if the NixOS - modules use features not provided by the currently installed - version of Nix. This option disables building a new Nix. + + Fetch the latest version of NixOS from the NixOS channel. + - - - - + + + + - Equivalent to - . This option is useful if you - call nixos-rebuild frequently (e.g. if you’re - hacking on a NixOS module). + + Causes the boot loader to be (re)installed on the device specified by the + relevant configuration options. + - - - - + + + + - Instead of building a new configuration as specified by - /etc/nixos/configuration.nix, roll back to - the previous configuration. (The previous configuration is - defined as the one before the “current” generation of the - Nix profile /nix/var/nix/profiles/system.) + + Normally, nixos-rebuild first builds the + nixUnstable attribute in Nixpkgs, and uses the + resulting instance of the Nix package manager to build the new system + configuration. This is necessary if the NixOS modules use features not + provided by the currently installed version of Nix. This option disables + building a new Nix. + - - - - - + + + + - Instead of using the Nix profile - /nix/var/nix/profiles/system to keep track - of the current and previous system configurations, use + + Equivalent to + . This option is useful if you call + nixos-rebuild frequently (e.g. if you’re hacking on + a NixOS module). + + + + + + + + + Instead of building a new configuration as specified by + /etc/nixos/configuration.nix, roll back to the + previous configuration. (The previous configuration is defined as the one + before the “current” generation of the Nix profile + /nix/var/nix/profiles/system.) + + + + + + + + + + + Instead of using the Nix profile + /nix/var/nix/profiles/system to keep track of the + current and previous system configurations, use /nix/var/nix/profiles/system-profiles/name. - When you use GRUB 2, for every system profile created with this - flag, NixOS will create a submenu named “NixOS - Profile - 'name'” in GRUB’s boot menu, - containing the current and previous configurations of this - profile. - - For instance, if you want to test a configuration file - named test.nix without affecting the - default system profile, you would do: - + When you use GRUB 2, for every system profile created with this flag, + NixOS will create a submenu named “NixOS - Profile + 'name'” in GRUB’s boot menu, containing + the current and previous configurations of this profile. + + + For instance, if you want to test a configuration file named + test.nix without affecting the default system + profile, you would do: $ nixos-rebuild switch -p test -I nixos-config=./test.nix - - The new configuration will appear in the GRUB 2 submenu “NixOS - Profile - 'test'”. + The new configuration will appear in the GRUB 2 submenu “NixOS - + Profile 'test'”. + - - - - + + + + - Instead of building the new configuration locally, use the - specified host to perform the build. The host needs to be accessible - with ssh, and must be able to perform Nix builds. If the option + + Instead of building the new configuration locally, use the specified host + to perform the build. The host needs to be accessible with ssh, and must + be able to perform Nix builds. If the option is not set, the build will be copied back - to the local machine when done. - - Note that, if is not specified, - Nix will be built both locally and remotely. This is because the - configuration will always be evaluated locally even though the building - might be performed remotely. - - You can include a remote user name in - the host name (user@host). You can also set - ssh options by defining the NIX_SSHOPTS environment - variable. + to the local machine when done. + + + Note that, if is not specified, Nix will + be built both locally and remotely. This is because the configuration + will always be evaluated locally even though the building might be + performed remotely. + + + You can include a remote user name in the host name + (user@host). You can also set ssh options by + defining the NIX_SSHOPTS environment variable. + - - - - + + + + - Specifies the NixOS target host. By setting this to something other - than localhost, the system activation will - happen on the remote host instead of the local machine. The remote host - needs to be accessible over ssh, and for the commands - , and - you need root access. - - If is not explicitly - specified, will implicitly be set to the - same value as . So, if you only specify + + Specifies the NixOS target host. By setting this to something other than + localhost, the system activation will happen + on the remote host instead of the local machine. The remote host needs to + be accessible over ssh, and for the commands , + and you need root access. + + + If is not explicitly specified, + will implicitly be set to the same value as + . So, if you only specify both building and activation will take place remotely (and no build artifacts will be copied to the local - machine). - - You can include a remote user name in - the host name (user@host). You can also set - ssh options by defining the NIX_SSHOPTS environment - variable. + machine). + + + You can include a remote user name in the host name + (user@host). You can also set ssh options by + defining the NIX_SSHOPTS environment variable. + - - - - -In addition, nixos-rebuild accepts various -Nix-related flags, including / -, , -, and - / . See -the Nix manual for details. - - - - -Environment - - - - - NIXOS_CONFIG + + + + In addition, nixos-rebuild accepts various Nix-related + flags, including / , + , , + and / + . See the Nix manual for details. + + + + Environment + + + NIXOS_CONFIG + - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. + + Path to the main NixOS configuration module. Defaults to + /etc/nixos/configuration.nix. + - - - NIX_SSHOPTS - - Additional options to be passed to - ssh on the command line. - - - - - - - - -Files - - - - - /run/current-system + + + NIX_SSHOPTS + - A symlink to the currently active system configuration in - the Nix store. + + Additional options to be passed to ssh on the command + line. + - - - - /nix/var/nix/profiles/system + + + + + Files + + + /run/current-system + - The Nix profile that contains the current and previous - system configurations. Used to generate the GRUB boot - menu. + + A symlink to the currently active system configuration in the Nix store. + - - - - - - - -Bugs - -This command should be renamed to something more -descriptive. - - - - - + + + /nix/var/nix/profiles/system + + + + The Nix profile that contains the current and previous system + configurations. Used to generate the GRUB boot menu. + + + + + + + Bugs + + This command should be renamed to something more descriptive. + + diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index 615d74f90908..c173bce19136 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -1,97 +1,102 @@ - - - nixos-version - 8 + + nixos-version + 8 NixOS - - - - nixos-version - show the NixOS version - - - - - nixos-version - - + + + nixos-version + show the NixOS version + + + nixos-version + + + + - - -Description - -This command shows the version of the currently active NixOS -configuration. For example: - + + + Description + + This command shows the version of the currently active NixOS configuration. + For example: $ nixos-version 16.03.1011.6317da4 (Emu) - -The version consists of the following elements: - - - - - 16.03 - The NixOS release, indicating the year and month - in which it was released (e.g. March 2016). - - - - 1011 - The number of commits in the Nixpkgs Git - repository between the start of the release branch and the commit - from which this version was built. This ensures that NixOS - versions are monotonically increasing. It is - git when the current NixOS configuration was - built from a checkout of the Nixpkgs Git repository rather than - from a NixOS channel. - - - - 6317da4 - The first 7 characters of the commit in the - Nixpkgs Git repository from which this version was - built. - - - - Emu - The code name of the NixOS release. The first - letter of the code name indicates that this is the N'th stable - NixOS release; for example, Emu is the fifth - release. - - - - - - - - - -Options - -This command accepts the following options: - - - - - - + The version consists of the following elements: + + + 16.03 + + + + The NixOS release, indicating the year and month in which it was + released (e.g. March 2016). + + + + + 1011 + + + + The number of commits in the Nixpkgs Git repository between the start of + the release branch and the commit from which this version was built. + This ensures that NixOS versions are monotonically increasing. It is + git when the current NixOS configuration was built + from a checkout of the Nixpkgs Git repository rather than from a NixOS + channel. + + + + + 6317da4 + + + + The first 7 characters of the commit in the Nixpkgs Git repository from + which this version was built. + + + + + Emu + + + + The code name of the NixOS release. The first letter of the code name + indicates that this is the N'th stable NixOS release; for example, Emu + is the fifth release. + + + + + + + + Options + + This command accepts the following options: + + + + + + + - Show the full SHA1 hash of the Git commit from which this - configuration was built, e.g. + + Show the full SHA1 hash of the Git commit from which this configuration + was built, e.g. $ nixos-version --hash 6317da40006f6bc2480c6781999c52d88dde2acf - + - - - - + + + diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 80a8458fbfec..0390dda6468f 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -1,33 +1,20 @@ - - NixOS Reference Pages - - - - - - Eelco - Dolstra - - Author - - - - 2007-2018 - Eelco Dolstra - - - - - - - - - - - - - + NixOS Reference Pages + + EelcoDolstra + Author + + 2007-2018Eelco Dolstra + + + + + + + + + + diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 676924e5c8b2..61b21203f500 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -3,46 +3,46 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="book-nixos-manual"> - - - NixOS Manual - Version - - - - Preface - - This manual describes how to install, use and extend NixOS, - a Linux distribution based on the purely functional package - management system Nix. - - If you encounter problems, please report them on the - + NixOS Manual + Version + + + + Preface + + This manual describes how to install, use and extend NixOS, a Linux + distribution based on the purely functional package management system Nix. + + + If you encounter problems, please report them on the + nix-devel - mailing list or on the - #nixos channel on Freenode. Bugs should - be reported in NixOS’ GitHub - issue tracker. - - Commands prefixed with # have to be run as - root, either requiring to login as root user or temporarily switching - to it using sudo for example. - - - - - - - - - - Configuration Options - #nixos channel on Freenode. Bugs should be + reported in + NixOS’ + GitHub issue tracker. + + + + Commands prefixed with # have to be run as root, either + requiring to login as root user or temporarily switching to it using + sudo for example. + + + + + + + + + + Configuration Options + - - - - + + diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index b7f9fab44f3b..94f176186b6e 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -3,21 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="ch-release-notes"> - -Release Notes - -This section lists the release notes for each stable version of NixOS -and current unstable revision. - - - - - - - - - - - - + Release Notes + + This section lists the release notes for each stable version of NixOS and + current unstable revision. + + + + + + + + + + + diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml index 583912d70738..248bab70c36b 100644 --- a/nixos/doc/manual/release-notes/rl-1310.xml +++ b/nixos/doc/manual/release-notes/rl-1310.xml @@ -3,9 +3,9 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-13.10"> + Release 13.10 (“Aardvark”, 2013/10/31) -Release 13.10 (“Aardvark”, 2013/10/31) - -This is the first stable release branch of NixOS. - + + This is the first stable release branch of NixOS. + diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 137caf14cba2..8d8cea4303a3 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -3,158 +3,177 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-14.04"> + Release 14.04 (“Baboon”, 2014/04/30) -Release 14.04 (“Baboon”, 2014/04/30) - -This is the second stable release branch of NixOS. In addition -to numerous new and upgraded packages and modules, this release has -the following highlights: - - - - Installation on UEFI systems is now supported. See - for - details. - - Systemd has been updated to version 212, which has - numerous - improvements. NixOS now automatically starts systemd user - instances when you log in. You can define global user units through - the options. - - NixOS is now based on Glibc 2.19 and GCC - 4.8. - - The default Linux kernel has been updated to - 3.12. - - KDE has been updated to 4.12. - - GNOME 3.10 experimental support has been added. - - Nix has been updated to 1.7 (details). - - NixOS now supports fully declarative management of - users and groups. If you set to - false, then the contents of - /etc/passwd and /etc/group - will be + This is the second stable release branch of NixOS. In addition to numerous + new and upgraded packages and modules, this release has the following + highlights: + + + + Installation on UEFI systems is now supported. See + for details. + + + + + Systemd has been updated to version 212, which has + numerous + improvements. NixOS now automatically starts systemd user instances + when you log in. You can define global user units through the + options. + + + + + NixOS is now based on Glibc 2.19 and GCC 4.8. + + + + + The default Linux kernel has been updated to 3.12. + + + + + KDE has been updated to 4.12. + + + + + GNOME 3.10 experimental support has been added. + + + + + Nix has been updated to 1.7 + (details). + + + + + NixOS now supports fully declarative management of users and groups. If + you set to false, + then the contents of /etc/passwd and + /etc/group will be + congruent - to your NixOS configuration. For instance, if you remove a user from - and run - nixos-rebuild, the user account will cease to - exist. Also, imperative commands for managing users and groups, such - as useradd, are no longer available. If - is true (the - default), then behaviour is unchanged from NixOS - 13.10. - - NixOS now has basic container support, meaning you - can easily run a NixOS instance as a container in a NixOS host - system. These containers are suitable for testing and - experimentation but not production use, since they’re not fully - isolated from the host. See for - details. - - Systemd units provided by packages can now be - overridden from the NixOS configuration. For instance, if a package - foo provides systemd units, you can say: - + to your NixOS configuration. For instance, if you remove a user from + and run + nixos-rebuild, the user account will cease to exist. + Also, imperative commands for managing users and groups, such as + useradd, are no longer available. If + is true (the + default), then behaviour is unchanged from NixOS 13.10. + + + + + NixOS now has basic container support, meaning you can easily run a NixOS + instance as a container in a NixOS host system. These containers are + suitable for testing and experimentation but not production use, since + they’re not fully isolated from the host. See + for details. + + + + + Systemd units provided by packages can now be overridden from the NixOS + configuration. For instance, if a package foo provides + systemd units, you can say: systemd.packages = [ pkgs.foo ]; - - to enable those units. You can then set or override unit options in - the usual way, e.g. - + to enable those units. You can then set or override unit options in the + usual way, e.g. systemd.services.foo.wantedBy = [ "multi-user.target" ]; systemd.services.foo.serviceConfig.MemoryLimit = "512M"; + + + + - - - - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - - Nixpkgs no longer exposes unfree packages by - default. If your NixOS configuration requires unfree packages from - Nixpkgs, you need to enable support for them explicitly by setting: - + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + Nixpkgs no longer exposes unfree packages by default. If your NixOS + configuration requires unfree packages from Nixpkgs, you need to enable + support for them explicitly by setting: nixpkgs.config.allowUnfree = true; - - Otherwise, you get an error message such as: - + Otherwise, you get an error message such as: error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’ has an unfree license, refusing to evaluate - - - - The Adobe Flash player is no longer enabled by - default in the Firefox and Chromium wrappers. To enable it, you must - set: - + + + + + The Adobe Flash player is no longer enabled by default in the Firefox and + Chromium wrappers. To enable it, you must set: nixpkgs.config.allowUnfree = true; nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium - - - - The firewall is now enabled by default. If you don’t - want this, you need to disable it explicitly: - + + + + + The firewall is now enabled by default. If you don’t want this, you need + to disable it explicitly: networking.firewall.enable = false; - - - - The option - has been renamed to - . - - The mysql55 service has been - merged into the mysql service, which no longer - sets a default for the option - . - - Package variants are now differentiated by suffixing - the name, rather than the version. For instance, - sqlite-3.8.4.3-interactive is now called - sqlite-interactive-3.8.4.3. This ensures that - nix-env -i sqlite is unambiguous, and that - nix-env -u won’t “upgrade” - sqlite to sqlite-interactive - or vice versa. Notably, this change affects the Firefox wrapper - (which provides plugins), as it is now called - firefox-wrapper. So when using - nix-env, you should do nix-env -e - firefox; nix-env -i firefox-wrapper if you want to keep - using the wrapper. This change does not affect declarative package - management, since attribute names like - pkgs.firefoxWrapper were already - unambiguous. - - The symlink /etc/ca-bundle.crt - is gone. Programs should instead use the environment variable - OPENSSL_X509_CERT_FILE (which points to - /etc/ssl/certs/ca-bundle.crt). - - - - - + + + + + The option has been renamed to + . + + + + + The mysql55 service has been merged into the + mysql service, which no longer sets a default for the + option . + + + + + Package variants are now differentiated by suffixing the name, rather than + the version. For instance, sqlite-3.8.4.3-interactive + is now called sqlite-interactive-3.8.4.3. This + ensures that nix-env -i sqlite is unambiguous, and that + nix-env -u won’t “upgrade” + sqlite to sqlite-interactive or vice + versa. Notably, this change affects the Firefox wrapper (which provides + plugins), as it is now called firefox-wrapper. So when + using nix-env, you should do nix-env -e + firefox; nix-env -i firefox-wrapper if you want to keep using + the wrapper. This change does not affect declarative package management, + since attribute names like pkgs.firefoxWrapper were + already unambiguous. + + + + + The symlink /etc/ca-bundle.crt is gone. Programs + should instead use the environment variable + OPENSSL_X509_CERT_FILE (which points to + /etc/ssl/certs/ca-bundle.crt). + + + + diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml index 42b51cd4a8ef..4d93aa644c1d 100644 --- a/nixos/doc/manual/release-notes/rl-1412.xml +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -3,175 +3,465 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-14.12"> + Release 14.12 (“Caterpillar”, 2014/12/30) -Release 14.12 (“Caterpillar”, 2014/12/30) + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + Systemd has been updated to version 217, which has numerous + improvements. + + + + + + Nix has been updated to 1.8. + + + + + NixOS is now based on Glibc 2.20. + + + + + KDE has been updated to 4.14. + + + + + The default Linux kernel has been updated to 3.14. + + + + + If is enabled (the default), changes + made to the declaration of a user or group will be correctly realised when + running nixos-rebuild. For instance, removing a user + specification from configuration.nix will cause the + actual user account to be deleted. If + is disabled, it is no longer necessary to specify UIDs or GIDs; if + omitted, they are allocated dynamically. + + + + -In addition to numerous new and upgraded packages, this release has the following highlights: + + Following new services were added since the last release: + + + + atftpd + + + + + bosun + + + + + bspwm + + + + + chronos + + + + + collectd + + + + + consul + + + + + cpuminer-cryptonight + + + + + crashplan + + + + + dnscrypt-proxy + + + + + docker-registry + + + + + docker + + + + + etcd + + + + + fail2ban + + + + + fcgiwrap + + + + + fleet + + + + + fluxbox + + + + + gdm + + + + + geoclue2 + + + + + gitlab + + + + + gitolite + + + + + gnome3.gnome-documents + + + + + gnome3.gnome-online-miners + + + + + gnome3.gvfs + + + + + gnome3.seahorse + + + + + hbase + + + + + i2pd + + + + + influxdb + + + + + kubernetes + + + + + liquidsoap + + + + + lxc + + + + + mailpile + + + + + mesos + + + + + mlmmj + + + + + monetdb + + + + + mopidy + + + + + neo4j + + + + + nsd + + + + + openntpd + + + + + opentsdb + + + + + openvswitch + + + + + parallels-guest + + + + + peerflix + + + + + phd + + + + + polipo + + + + + prosody + + + + + radicale + + + + + redmine + + + + + riemann + + + + + scollector + + + + + seeks + + + + + siproxd + + + + + strongswan + + + + + tcsd + + + + + teamspeak3 + + + + + thermald + + + + + torque/mrom + + + + + torque/server + + + + + uhub + + + + + unifi + + + + + znc + + + + + zookeeper + + + + - - -Systemd has been updated to version 217, which has numerous -improvements. - - -Nix has been updated to 1.8. - -NixOS is now based on Glibc 2.20. - -KDE has been updated to 4.14. - -The default Linux kernel has been updated to 3.14. - -If is enabled (the -default), changes made to the declaration of a user or group will be -correctly realised when running nixos-rebuild. For -instance, removing a user specification from -configuration.nix will cause the actual user -account to be deleted. If is -disabled, it is no longer necessary to specify UIDs or GIDs; if -omitted, they are allocated dynamically. - - - -Following new services were added since the last release: - - -atftpd -bosun -bspwm -chronos -collectd -consul -cpuminer-cryptonight -crashplan -dnscrypt-proxy -docker-registry -docker -etcd -fail2ban -fcgiwrap -fleet -fluxbox -gdm -geoclue2 -gitlab -gitolite -gnome3.gnome-documents -gnome3.gnome-online-miners -gnome3.gvfs -gnome3.seahorse -hbase -i2pd -influxdb -kubernetes -liquidsoap -lxc -mailpile -mesos -mlmmj -monetdb -mopidy -neo4j -nsd -openntpd -opentsdb -openvswitch -parallels-guest -peerflix -phd -polipo -prosody -radicale -redmine -riemann -scollector -seeks -siproxd -strongswan -tcsd -teamspeak3 -thermald -torque/mrom -torque/server -uhub -unifi -znc -zookeeper - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - -The default version of Apache httpd is now 2.4. If -you use the option to pass literal -Apache configuration text, you may need to update it — see + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + The default version of Apache httpd is now 2.4. If you use the + option to pass literal Apache configuration + text, you may need to update it — see + Apache’s -documentation for details. If you wish to continue to use -httpd 2.2, add the following line to your NixOS configuration: - + documentation for details. If you wish to continue to use httpd + 2.2, add the following line to your NixOS configuration: services.httpd.package = pkgs.apacheHttpd_2_2; - - - -PHP 5.3 has been removed because it is no longer -supported by the PHP project. A migration guide is -available. - -The host side of a container virtual Ethernet pair -is now called ve-container-name -rather than c-container-name. - -GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. - -VirtualBox has been upgraded to 4.3.20 release. Users -may be required to run rm -rf /tmp/.vbox*. The line -imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ] is -no longer necessary, use services.virtualboxHost.enable = -true instead. - -Also, hardening mode is now enabled by default, which means that unless you want to use -USB support, you no longer need to be a member of the vboxusers group. - - -Chromium has been updated to 39.0.2171.65. is now enabled by default. -chromium*Wrapper packages no longer exist, because upstream removed NSAPI support. -chromium-stable has been renamed to chromium. - - -Python packaging documentation is now part of nixpkgs manual. To override -the python packages available to a custom python you now use pkgs.pythonFull.buildEnv.override -instead of pkgs.pythonFull.override. - - -boot.resumeDevice = "8:6" is no longer supported. Most users will -want to leave it undefined, which takes the swap partitions automatically. There is an evaluation -assertion to ensure that the string starts with a slash. - - -The system-wide default timezone for NixOS installations -changed from CET to UTC. To choose -a different timezone for your system, configure -time.timeZone in -configuration.nix. A fairly complete list of possible -values for that setting is available at . - -GNU screen has been updated to 4.2.1, which breaks -the ability to connect to sessions created by older versions of -screen. - -The Intel GPU driver was updated to the 3.x prerelease -version (used by most distributions) and supports DRI3 -now. - - - - - + + + + + PHP 5.3 has been removed because it is no longer supported by the PHP + project. A migration + guide is available. + + + + + The host side of a container virtual Ethernet pair is now called + ve-container-name rather + than c-container-name. + + + + + GNOME 3.10 support has been dropped. The default GNOME version is now + 3.12. + + + + + VirtualBox has been upgraded to 4.3.20 release. Users may be required to + run rm -rf /tmp/.vbox*. The line imports = [ + <nixpkgs/nixos/modules/programs/virtualbox.nix> ] is no + longer necessary, use services.virtualboxHost.enable = + true instead. + + + Also, hardening mode is now enabled by default, which means that unless + you want to use USB support, you no longer need to be a member of the + vboxusers group. + + + + + Chromium has been updated to 39.0.2171.65. + is now enabled by default. + chromium*Wrapper packages no longer exist, because + upstream removed NSAPI support. chromium-stable has + been renamed to chromium. + + + + + Python packaging documentation is now part of nixpkgs manual. To override + the python packages available to a custom python you now use + pkgs.pythonFull.buildEnv.override instead of + pkgs.pythonFull.override. + + + + + boot.resumeDevice = "8:6" is no longer supported. Most + users will want to leave it undefined, which takes the swap partitions + automatically. There is an evaluation assertion to ensure that the string + starts with a slash. + + + + + The system-wide default timezone for NixOS installations changed from + CET to UTC. To choose a different + timezone for your system, configure time.timeZone in + configuration.nix. A fairly complete list of possible + values for that setting is available at + . + + + + + GNU screen has been updated to 4.2.1, which breaks the ability to connect + to sessions created by older versions of screen. + + + + + The Intel GPU driver was updated to the 3.x prerelease version (used by + most distributions) and supports DRI3 now. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 6c1c46844ccb..e500c9d63422 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -3,375 +3,640 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-15.09"> + Release 15.09 (“Dingo”, 2015/09/30) -Release 15.09 (“Dingo”, 2015/09/30) - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + - The Haskell - packages infrastructure has been re-designed from the ground up - ("Haskell NG"). NixOS now distributes the latest version - of every single package registered on Hackage -- well in - excess of 8,000 Haskell packages. Detailed instructions on how to - use that infrastructure can be found in the + The Haskell packages + infrastructure has been re-designed from the ground up ("Haskell + NG"). NixOS now distributes the latest version of every single package + registered on + Hackage -- well + in excess of 8,000 Haskell packages. Detailed instructions on how to use + that infrastructure can be found in the + User's - Guide to the Haskell Infrastructure. Users migrating from an - earlier release may find helpful information below, in the list of - backwards-incompatible changes. Furthermore, we distribute 51(!) - additional Haskell package sets that provide every single . Users migrating from an earlier + release may find helpful information below, in the list of + backwards-incompatible changes. Furthermore, we distribute 51(!) additional + Haskell package sets that provide every single + LTS Haskell release - since version 0.0 as well as the most recent Stackage Nightly - snapshot. The announcement "Full - Stackage Support in Nixpkgs" gives additional - details. + Stackage Support in Nixpkgs" gives additional details. + - - Nix has been updated to version 1.10, which among other - improvements enables cryptographic signatures on binary caches for - improved security. + + Nix has been updated to version 1.10, which among other improvements + enables cryptographic signatures on binary caches for improved security. + - - You can now keep your NixOS system up to date automatically - by setting - + + You can now keep your NixOS system up to date automatically by setting system.autoUpgrade.enable = true; - - This will cause the system to periodically check for updates in - your current channel and run nixos-rebuild. + This will cause the system to periodically check for updates in your + current channel and run nixos-rebuild. + - - This release is based on Glibc 2.21, GCC 4.9 and Linux - 3.18. + + This release is based on Glibc 2.21, GCC 4.9 and Linux 3.18. + - - GNOME has been upgraded to 3.16. - + + GNOME has been upgraded to 3.16. + - - Xfce has been upgraded to 4.12. - + + Xfce has been upgraded to 4.12. + - - KDE 5 has been upgraded to KDE Frameworks 5.10, - Plasma 5.3.2 and Applications 15.04.3. - KDE 4 has been updated to kdelibs-4.14.10. - + + KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and + Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10. + - - E19 has been upgraded to 0.16.8.15. - + + E19 has been upgraded to 0.16.8.15. + + - - - -The following new services were added since the last release: - + + The following new services were added since the last release: - services/mail/exim.nix - services/misc/apache-kafka.nix - services/misc/canto-daemon.nix - services/misc/confd.nix - services/misc/devmon.nix - services/misc/gitit.nix - services/misc/ihaskell.nix - services/misc/mbpfan.nix - services/misc/mediatomb.nix - services/misc/mwlib.nix - services/misc/parsoid.nix - services/misc/plex.nix - services/misc/ripple-rest.nix - services/misc/ripple-data-api.nix - services/misc/subsonic.nix - services/misc/sundtek.nix - services/monitoring/cadvisor.nix - services/monitoring/das_watchdog.nix - services/monitoring/grafana.nix - services/monitoring/riemann-tools.nix - services/monitoring/teamviewer.nix - services/network-filesystems/u9fs.nix - services/networking/aiccu.nix - services/networking/asterisk.nix - services/networking/bird.nix - services/networking/charybdis.nix - services/networking/docker-registry-server.nix - services/networking/fan.nix - services/networking/firefox/sync-server.nix - services/networking/gateone.nix - services/networking/heyefi.nix - services/networking/i2p.nix - services/networking/lambdabot.nix - services/networking/mstpd.nix - services/networking/nix-serve.nix - services/networking/nylon.nix - services/networking/racoon.nix - services/networking/skydns.nix - services/networking/shout.nix - services/networking/softether.nix - services/networking/sslh.nix - services/networking/tinc.nix - services/networking/tlsdated.nix - services/networking/tox-bootstrapd.nix - services/networking/tvheadend.nix - services/networking/zerotierone.nix - services/scheduling/marathon.nix - services/security/fprintd.nix - services/security/hologram.nix - services/security/munge.nix - services/system/cloud-init.nix - services/web-servers/shellinabox.nix - services/web-servers/uwsgi.nix - services/x11/unclutter.nix - services/x11/display-managers/sddm.nix - system/boot/coredump.nix - system/boot/loader/loader.nix - system/boot/loader/generic-extlinux-compatible - system/boot/networkd.nix - system/boot/resolved.nix - system/boot/timesyncd.nix - tasks/filesystems/exfat.nix - tasks/filesystems/ntfs.nix - tasks/filesystems/vboxsf.nix - virtualisation/virtualbox-host.nix - virtualisation/vmware-guest.nix - virtualisation/xen-dom0.nix + + + services/mail/exim.nix + + + + + services/misc/apache-kafka.nix + + + + + services/misc/canto-daemon.nix + + + + + services/misc/confd.nix + + + + + services/misc/devmon.nix + + + + + services/misc/gitit.nix + + + + + services/misc/ihaskell.nix + + + + + services/misc/mbpfan.nix + + + + + services/misc/mediatomb.nix + + + + + services/misc/mwlib.nix + + + + + services/misc/parsoid.nix + + + + + services/misc/plex.nix + + + + + services/misc/ripple-rest.nix + + + + + services/misc/ripple-data-api.nix + + + + + services/misc/subsonic.nix + + + + + services/misc/sundtek.nix + + + + + services/monitoring/cadvisor.nix + + + + + services/monitoring/das_watchdog.nix + + + + + services/monitoring/grafana.nix + + + + + services/monitoring/riemann-tools.nix + + + + + services/monitoring/teamviewer.nix + + + + + services/network-filesystems/u9fs.nix + + + + + services/networking/aiccu.nix + + + + + services/networking/asterisk.nix + + + + + services/networking/bird.nix + + + + + services/networking/charybdis.nix + + + + + services/networking/docker-registry-server.nix + + + + + services/networking/fan.nix + + + + + services/networking/firefox/sync-server.nix + + + + + services/networking/gateone.nix + + + + + services/networking/heyefi.nix + + + + + services/networking/i2p.nix + + + + + services/networking/lambdabot.nix + + + + + services/networking/mstpd.nix + + + + + services/networking/nix-serve.nix + + + + + services/networking/nylon.nix + + + + + services/networking/racoon.nix + + + + + services/networking/skydns.nix + + + + + services/networking/shout.nix + + + + + services/networking/softether.nix + + + + + services/networking/sslh.nix + + + + + services/networking/tinc.nix + + + + + services/networking/tlsdated.nix + + + + + services/networking/tox-bootstrapd.nix + + + + + services/networking/tvheadend.nix + + + + + services/networking/zerotierone.nix + + + + + services/scheduling/marathon.nix + + + + + services/security/fprintd.nix + + + + + services/security/hologram.nix + + + + + services/security/munge.nix + + + + + services/system/cloud-init.nix + + + + + services/web-servers/shellinabox.nix + + + + + services/web-servers/uwsgi.nix + + + + + services/x11/unclutter.nix + + + + + services/x11/display-managers/sddm.nix + + + + + system/boot/coredump.nix + + + + + system/boot/loader/loader.nix + + + + + system/boot/loader/generic-extlinux-compatible + + + + + system/boot/networkd.nix + + + + + system/boot/resolved.nix + + + + + system/boot/timesyncd.nix + + + + + tasks/filesystems/exfat.nix + + + + + tasks/filesystems/ntfs.nix + + + + + tasks/filesystems/vboxsf.nix + + + + + virtualisation/virtualbox-host.nix + + + + + virtualisation/vmware-guest.nix + + + + + virtualisation/xen-dom0.nix + + - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - -sshd no longer supports DSA and ECDSA -host keys by default. If you have existing systems with such host keys -and want to continue to use them, please set + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + sshd no longer supports DSA and ECDSA host keys by + default. If you have existing systems with such host keys and want to + continue to use them, please set system.stateVersion = "14.12"; - -The new option ensures that -certain configuration changes that could break existing systems (such -as the sshd host key setting) will maintain -compatibility with the specified NixOS release. NixOps sets the state -version of existing deployments automatically. - -cron is no longer enabled by -default, unless you have a non-empty -. To force -cron to be enabled, set -. - -Nix now requires binary caches to be cryptographically -signed. If you have unsigned binary caches that you want to continue -to use, you should set . - -Steam now doesn't need root rights to work. Instead of using -*-steam-chrootenv, you should now just run steam. -steamChrootEnv package was renamed to steam, -and old steam package -- to steamOriginal. - - -CMPlayer has been renamed to bomi upstream. Package -cmplayer was accordingly renamed to -bomi - -Atom Shell has been renamed to Electron upstream. Package atom-shell -was accordingly renamed to electron - - -Elm is not released on Hackage anymore. You should now use elmPackages.elm -which contains the latest Elm platform. - - - The CUPS printing service has been updated to version - 2.0.2. Furthermore its systemd service has been - renamed to cups.service. - - Local printers are no longer shared or advertised by - default. This behavior can be changed by enabling - or - respectively. - - - - - The VirtualBox host and guest options have been named more - consistently. They can now found in - instead of - and - instead of - . - - - - Also, there now is support for the vboxsf file - system using the configuration - attribute. An example of how this can be used in a configuration: - + The new option ensures that certain + configuration changes that could break existing systems (such as the + sshd host key setting) will maintain compatibility with + the specified NixOS release. NixOps sets the state version of existing + deployments automatically. + + + + + cron is no longer enabled by default, unless you have a + non-empty . To force + cron to be enabled, set . + + + + + Nix now requires binary caches to be cryptographically signed. If you have + unsigned binary caches that you want to continue to use, you should set + . + + + + + Steam now doesn't need root rights to work. Instead of using + *-steam-chrootenv, you should now just run + steam. steamChrootEnv package was + renamed to steam, and old steam + package -- to steamOriginal. + + + + + CMPlayer has been renamed to bomi upstream. Package + cmplayer was accordingly renamed to + bomi + + + + + Atom Shell has been renamed to Electron upstream. Package + atom-shell was accordingly renamed to + electron + + + + + Elm is not released on Hackage anymore. You should now use + elmPackages.elm which contains the latest Elm platform. + + + + + The CUPS printing service has been updated to version + 2.0.2. Furthermore its systemd service has been renamed + to cups.service. + + + Local printers are no longer shared or advertised by default. This + behavior can be changed by enabling + or + respectively. + + + + + The VirtualBox host and guest options have been named more consistently. + They can now found in + instead of and + instead of + . + + + Also, there now is support for the vboxsf file system + using the configuration attribute. An example + of how this can be used in a configuration: fileSystems."/shiny" = { device = "myshinysharedfolder"; fsType = "vboxsf"; }; - - - - - - - "nix-env -qa" no longer discovers - Haskell packages by name. The only packages visible in the global - scope are ghc, cabal-install, - and stack, but all other packages are hidden. The - reason for this inconvenience is the sheer size of the Haskell - package set. Name-based lookups are expensive, and most - nix-env -qa operations would become much slower - if we'd add the entire Hackage database into the top level attribute - set. Instead, the list of Haskell packages can be displayed by - running: - - + + + + + "nix-env -qa" no longer discovers Haskell + packages by name. The only packages visible in the global scope are + ghc, cabal-install, and + stack, but all other packages are hidden. The reason + for this inconvenience is the sheer size of the Haskell package set. + Name-based lookups are expensive, and most nix-env -qa + operations would become much slower if we'd add the entire Hackage + database into the top level attribute set. Instead, the list of Haskell + packages can be displayed by running: + + nix-env -f "<nixpkgs>" -qaP -A haskellPackages - - Executable programs written in Haskell can be installed with: - - + + Executable programs written in Haskell can be installed with: + + nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - - Installing Haskell libraries this way, however, is no - longer supported. See the next item for more details. - - - - - - Previous versions of NixOS came with a feature called - ghc-wrapper, a small script that allowed GHC to - transparently pick up on libraries installed in the user's profile. This - feature has been deprecated; ghc-wrapper was removed - from the distribution. The proper way to register Haskell libraries with - the compiler now is the haskellPackages.ghcWithPackages - function. The + Installing Haskell libraries this way, however, is no + longer supported. See the next item for more details. + + + + + Previous versions of NixOS came with a feature called + ghc-wrapper, a small script that allowed GHC to + transparently pick up on libraries installed in the user's profile. This + feature has been deprecated; ghc-wrapper was removed + from the distribution. The proper way to register Haskell libraries with + the compiler now is the haskellPackages.ghcWithPackages + function. The + User's - Guide to the Haskell Infrastructure provides more information about - this subject. - - - - - - All Haskell builds that have been generated with version 1.x of - the cabal2nix utility are now invalid and need - to be re-generated with a current version of - cabal2nix to function. The most recent version - of this tool can be installed by running - nix-env -i cabal2nix. - - - - - - The haskellPackages set in Nixpkgs used to have a - function attribute called extension that users - could override in their ~/.nixpkgs/config.nix - files to configure additional attributes, etc. That function still - exists, but it's now called overrides. - - - - - - The OpenBLAS library has been updated to version - 0.2.14. Support for the - x86_64-darwin platform was added. Dynamic - architecture detection was enabled; OpenBLAS now selects - microarchitecture-optimized routines at runtime, so optimal - performance is achieved without the need to rebuild OpenBLAS - locally. OpenBLAS has replaced ATLAS in most packages which use an - optimized BLAS or LAPACK implementation. - - - - - - The phpfpm is now using the default PHP version - (pkgs.php) instead of PHP 5.4 (pkgs.php54). - - - - - - The locate service no longer indexes the Nix store - by default, preventing packages with potentially numerous versions from - cluttering the output. Indexing the store can be activated by setting - . - - - - - - The Nix expression search path (NIX_PATH) no longer - contains /etc/nixos/nixpkgs by default. You - can override NIX_PATH by setting - . - - - - - - Python 2.6 has been marked as broken (as it no longer receives - security updates from upstream). - - - - - - Any use of module arguments such as pkgs to access - library functions, or to define imports attributes - will now lead to an infinite loop at the time of the evaluation. - - - - In case of an infinite loop, use the --show-trace - command line argument and read the line just above the error message. - + Guide to the Haskell Infrastructure provides more information about + this subject. + + + + + All Haskell builds that have been generated with version 1.x of the + cabal2nix utility are now invalid and need to be + re-generated with a current version of cabal2nix to + function. The most recent version of this tool can be installed by running + nix-env -i cabal2nix. + + + + + The haskellPackages set in Nixpkgs used to have a + function attribute called extension that users could + override in their ~/.nixpkgs/config.nix files to + configure additional attributes, etc. That function still exists, but it's + now called overrides. + + + + + The OpenBLAS library has been updated to version + 0.2.14. Support for the + x86_64-darwin platform was added. Dynamic architecture + detection was enabled; OpenBLAS now selects microarchitecture-optimized + routines at runtime, so optimal performance is achieved without the need + to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages + which use an optimized BLAS or LAPACK implementation. + + + + + The phpfpm is now using the default PHP version + (pkgs.php) instead of PHP 5.4 + (pkgs.php54). + + + + + The locate service no longer indexes the Nix store by + default, preventing packages with potentially numerous versions from + cluttering the output. Indexing the store can be activated by setting + . + + + + + The Nix expression search path (NIX_PATH) no longer + contains /etc/nixos/nixpkgs by default. You can + override NIX_PATH by setting . + + + + + Python 2.6 has been marked as broken (as it no longer receives security + updates from upstream). + + + + + Any use of module arguments such as pkgs to access + library functions, or to define imports attributes will + now lead to an infinite loop at the time of the evaluation. + + + In case of an infinite loop, use the --show-trace + command line argument and read the line just above the error message. $ nixos-rebuild build --show-trace … while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix": infinite recursion encountered - - - - - Any use of pkgs.lib, should be replaced by - lib, after adding it as argument of the module. The - following module - + + + Any use of pkgs.lib, should be replaced by + lib, after adding it as argument of the module. The + following module { config, pkgs, ... }: @@ -384,9 +649,7 @@ with pkgs.lib; config = mkIf config.foo { … }; } - - should be modified to look like: - + should be modified to look like: { config, pkgs, lib, ... }: @@ -399,13 +662,11 @@ with lib; config = mkIf config.foo { option definition }; } - - - - When pkgs is used to download other projects to - import their modules, and only in such cases, it should be replaced by - (import <nixpkgs> {}). The following module - + + + When pkgs is used to download other projects to import + their modules, and only in such cases, it should be replaced by + (import <nixpkgs> {}). The following module { config, pkgs, ... }: @@ -420,9 +681,7 @@ in imports = [ "${myProject}/module.nix" ]; } - - should be modified to look like: - + should be modified to look like: { config, pkgs, ... }: @@ -437,55 +696,55 @@ in imports = [ "${myProject}/module.nix" ]; } - + + + + - - - - - - -Other notable improvements: - - - - The nixos and nixpkgs channels were unified, - so one can use nix-env -iA nixos.bash - instead of nix-env -iA nixos.pkgs.bash. - See the commit for details. - - - + + Other notable improvements: + + - Users running an SSH server who worry about the quality of their - /etc/ssh/moduli file with respect to the - can use nix-env -iA nixos.bash + instead of nix-env -iA nixos.pkgs.bash. See + the + commit for details. + + + + + Users running an SSH server who worry about the quality of their + /etc/ssh/moduli file with respect to the + vulnerabilities - discovered in the Diffie-Hellman key exchange can now - replace OpenSSH's default version with one they generated - themselves using the new - option. - - - - - A newly packaged TeX Live 2015 is provided in pkgs.texlive, - split into 6500 nix packages. For basic user documentation see - the source. - Beware of an issue when installing a too large package set. - - The plan is to deprecate and maybe delete the original TeX packages - until the next release. - - - - on all Python interpreters - is now available for nix-shell interoperability. - - - - - + discovered in the Diffie-Hellman key exchange can now replace + OpenSSH's default version with one they generated themselves using the new + option. + + + + + A newly packaged TeX Live 2015 is provided in + pkgs.texlive, split into 6500 nix packages. For basic + user documentation see + the + source. Beware of + an + issue when installing a too large package set. The plan is to + deprecate and maybe delete the original TeX packages until the next + release. + + + + + on all Python interpreters is now available + for nix-shell interoperability. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 7279dd058270..9b512c4b1e58 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -3,250 +3,471 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-16.03"> + Release 16.03 (“Emu”, 2016/03/31) -Release 16.03 (“Emu”, 2016/03/31) - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + - Systemd 229, bringing + Systemd 229, bringing + numerous - improvements over 217. + improvements over 217. + - - Linux 4.4 (was 3.18). + + Linux 4.4 (was 3.18). + - - GCC 5.3 (was 4.9). Note that GCC 5 + GCC 5.3 (was 4.9). Note that GCC 5 + changes - the C++ ABI in an incompatible way; this may cause problems - if you try to link objects compiled with different versions of - GCC. + the C++ ABI in an incompatible way; this may cause problems if you + try to link objects compiled with different versions of GCC. + - - Glibc 2.23 (was 2.21). + + Glibc 2.23 (was 2.21). + - - Binutils 2.26 (was 2.23.1). See #909 + + Binutils 2.26 (was 2.23.1). See #909 + - - Improved support for ensuring bitwise reproducible - builds. For example, stdenv now sets the - environment variable + Improved support for ensuring + bitwise + reproducible builds. For example, stdenv now sets + the environment variable + SOURCE_DATE_EPOCH - to a deterministic value, and Nix has gained - an option to repeat a build a number of times to test - determinism. An ongoing project, the goal of exact reproducibility - is to allow binaries to be verified independently (e.g., a user - might only trust binaries that appear in three independent binary - caches). + an option to repeat a build a number of times to test determinism. + An ongoing project, the goal of exact reproducibility is to allow binaries + to be verified independently (e.g., a user might only trust binaries that + appear in three independent binary caches). + - - Perl 5.22. + + Perl 5.22. + + - - -The following new services were added since the last release: - + + The following new services were added since the last release: - services/monitoring/longview.nix - hardware/video/webcam/facetimehd.nix - i18n/input-method/default.nix - i18n/input-method/fcitx.nix - i18n/input-method/ibus.nix - i18n/input-method/nabi.nix - i18n/input-method/uim.nix - programs/fish.nix - security/acme.nix - security/audit.nix - security/oath.nix - services/hardware/irqbalance.nix - services/mail/dspam.nix - services/mail/opendkim.nix - services/mail/postsrsd.nix - services/mail/rspamd.nix - services/mail/rmilter.nix - services/misc/autofs.nix - services/misc/bepasty.nix - services/misc/calibre-server.nix - services/misc/cfdyndns.nix - services/misc/gammu-smsd.nix - services/misc/mathics.nix - services/misc/matrix-synapse.nix - services/misc/octoprint.nix - services/monitoring/hdaps.nix - services/monitoring/heapster.nix - services/monitoring/longview.nix - services/network-filesystems/netatalk.nix - services/network-filesystems/xtreemfs.nix - services/networking/autossh.nix - services/networking/dnschain.nix - services/networking/gale.nix - services/networking/miniupnpd.nix - services/networking/namecoind.nix - services/networking/ostinato.nix - services/networking/pdnsd.nix - services/networking/shairport-sync.nix - services/networking/supplicant.nix - services/search/kibana.nix - services/security/haka.nix - services/security/physlock.nix - services/web-apps/pump.io.nix - services/x11/hardware/libinput.nix - services/x11/window-managers/windowlab.nix - system/boot/initrd-network.nix - system/boot/initrd-ssh.nix - system/boot/loader/loader.nix - system/boot/networkd.nix - system/boot/resolved.nix - virtualisation/lxd.nix - virtualisation/rkt.nix - - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - - - We no longer produce graphical ISO images and VirtualBox - images for i686-linux. A minimal ISO image is - still provided. - - - - Firefox and similar browsers are now wrapped by default. - The package and attribute names are plain firefox - or midori, etc. Backward-compatibility attributes were set up, - but note that nix-env -u will not update - your current firefox-with-plugins; - you have to uninstall it and install firefox instead. - - - - wmiiSnap has been replaced with - wmii_hg, but - services.xserver.windowManager.wmii.enable has - been updated respectively so this only affects you if you have - explicitly installed wmiiSnap. + + + services/monitoring/longview.nix - + + + + hardware/video/webcam/facetimehd.nix + + + + + i18n/input-method/default.nix + + + + + i18n/input-method/fcitx.nix + + + + + i18n/input-method/ibus.nix + + + + + i18n/input-method/nabi.nix + + + + + i18n/input-method/uim.nix + + + + + programs/fish.nix + + + + + security/acme.nix + + + + + security/audit.nix + + + + + security/oath.nix + + + + + services/hardware/irqbalance.nix + + + + + services/mail/dspam.nix + + + + + services/mail/opendkim.nix + + + + + services/mail/postsrsd.nix + + + + + services/mail/rspamd.nix + + + + + services/mail/rmilter.nix + + + + + services/misc/autofs.nix + + + + + services/misc/bepasty.nix + + + + + services/misc/calibre-server.nix + + + + + services/misc/cfdyndns.nix + + + + + services/misc/gammu-smsd.nix + + + + + services/misc/mathics.nix + + + + + services/misc/matrix-synapse.nix + + + + + services/misc/octoprint.nix + + + + + services/monitoring/hdaps.nix + + + + + services/monitoring/heapster.nix + + + + + services/monitoring/longview.nix + + + + + services/network-filesystems/netatalk.nix + + + + + services/network-filesystems/xtreemfs.nix + + + + + services/networking/autossh.nix + + + + + services/networking/dnschain.nix + + + + + services/networking/gale.nix + + + + + services/networking/miniupnpd.nix + + + + + services/networking/namecoind.nix + + + + + services/networking/ostinato.nix + + + + + services/networking/pdnsd.nix + + + + + services/networking/shairport-sync.nix + + + + + services/networking/supplicant.nix + + + + + services/search/kibana.nix + + + + + services/security/haka.nix + + + + + services/security/physlock.nix + + + + + services/web-apps/pump.io.nix + + + + + services/x11/hardware/libinput.nix + + + + + services/x11/window-managers/windowlab.nix + + + + + system/boot/initrd-network.nix + + + + + system/boot/initrd-ssh.nix + + + + + system/boot/loader/loader.nix + + + + + system/boot/networkd.nix + + + + + system/boot/resolved.nix + + + + + virtualisation/lxd.nix + + + + + virtualisation/rkt.nix + + + + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + - jobs NixOS option has been removed. It served as + + We no longer produce graphical ISO images and VirtualBox images for + i686-linux. A minimal ISO image is still provided. + + + + + Firefox and similar browsers are now wrapped by + default. The package and attribute names are plain + firefox or midori, etc. + Backward-compatibility attributes were set up, but note that + nix-env -u will not update your + current firefox-with-plugins; you have to uninstall it + and install firefox instead. + + + + + wmiiSnap has been replaced with + wmii_hg, but + services.xserver.windowManager.wmii.enable has been + updated respectively so this only affects you if you have explicitly + installed wmiiSnap. + + + + + jobs NixOS option has been removed. It served as compatibility layer between Upstart jobs and SystemD services. All services - have been rewritten to use systemd.services + have been rewritten to use systemd.services + - - wmiimenu is removed, as it has been - removed by the developers upstream. Use wimenu - from the wmii-hg package. + + wmiimenu is removed, as it has been removed by the + developers upstream. Use wimenu from the + wmii-hg package. + - - Gitit is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. You - will need to add an import statement to your NixOS configuration - in order to use it, e.g. - + + Gitit is no longer automatically added to the module list in NixOS and as + such there will not be any manual entries for it. You will need to add an + import statement to your NixOS configuration in order to use it, e.g. ]; } ]]> - - will include the Gitit service configuration options. + will include the Gitit service configuration options. + - - nginx does not accept flags for enabling and - disabling modules anymore. Instead it accepts modules - argument, which is a list of modules to be built in. All modules now - reside in nginxModules set. Example configuration: - + + nginx does not accept flags for enabling and disabling + modules anymore. Instead it accepts modules argument, + which is a list of modules to be built in. All modules now reside in + nginxModules set. Example configuration: - + - - s3sync is removed, as it hasn't been - developed by upstream for 4 years and only runs with ruby 1.8. - For an actively-developer alternative look at - tarsnap and others. - + + s3sync is removed, as it hasn't been developed by + upstream for 4 years and only runs with ruby 1.8. For an actively-developer + alternative look at tarsnap and others. + - - ruby_1_8 has been removed as it's not - supported from upstream anymore and probably contains security - issues. - + + ruby_1_8 has been removed as it's not supported from + upstream anymore and probably contains security issues. + - - tidy-html5 package is removed. - Upstream only provided (lib)tidy5 during development, - and now they went back to (lib)tidy to work as a drop-in - replacement of the original package that has been unmaintained for years. - You can (still) use the html-tidy package, which got updated - to a stable release from this new upstream. + + tidy-html5 package is removed. Upstream only provided + (lib)tidy5 during development, and now they went back to + (lib)tidy to work as a drop-in replacement of the + original package that has been unmaintained for years. You can (still) use + the html-tidy package, which got updated to a stable + release from this new upstream. + - - extraDeviceOptions argument is removed - from bumblebee package. Instead there are - now two separate arguments: extraNvidiaDeviceOptions - and extraNouveauDeviceOptions for setting - extra X11 options for nvidia and nouveau drivers, respectively. - + + extraDeviceOptions argument is removed from + bumblebee package. Instead there are now two separate + arguments: extraNvidiaDeviceOptions and + extraNouveauDeviceOptions for setting extra X11 options + for nvidia and nouveau drivers, respectively. + - - The Ctrl+Alt+Backspace key combination - no longer kills the X server by default. - There's a new option - allowing to enable the combination again. - + + The Ctrl+Alt+Backspace key combination no longer kills + the X server by default. There's a new option + allowing to enable + the combination again. + - - emacsPackagesNg now contains all packages - from the ELPA, MELPA, and MELPA Stable repositories. - + + emacsPackagesNg now contains all packages from the ELPA, + MELPA, and MELPA Stable repositories. + - - Data directory for Postfix MTA server is moved from + + Data directory for Postfix MTA server is moved from /var/postfix to /var/lib/postfix. - Old configurations are migrated automatically. service.postfix - module has also received many improvements, such as correct directories' access - rights, new aliasFiles and mapFiles - options and more. + Old configurations are migrated automatically. + service.postfix module has also received many + improvements, such as correct directories' access rights, new + aliasFiles and mapFiles options and + more. + - - Filesystem options should now be configured as a list of strings, not - a comma-separated string. The old style will continue to work, but print a + + Filesystem options should now be configured as a list of strings, not a + comma-separated string. The old style will continue to work, but print a warning, until the 16.09 release. An example of the new style: - fileSystems."/example" = { device = "/dev/sdc"; @@ -254,103 +475,103 @@ fileSystems."/example" = { options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ]; }; - + - - CUPS, installed by services.printing module, now - has its data directory in /var/lib/cups. Old - configurations from /etc/cups are moved there - automatically, but there might be problems. Also configuration options + + CUPS, installed by services.printing module, now has its + data directory in /var/lib/cups. Old configurations + from /etc/cups are moved there automatically, but + there might be problems. Also configuration options services.printing.cupsdConf and - services.printing.cupsdFilesConf were removed - because they had been allowing one to override configuration variables - required for CUPS to work at all on NixOS. For most use cases, + services.printing.cupsdFilesConf were removed because + they had been allowing one to override configuration variables required for + CUPS to work at all on NixOS. For most use cases, services.printing.extraConf and new option - services.printing.extraFilesConf should be enough; - if you encounter a situation when they are not, please file a bug. - - There are also Gutenprint improvements; in particular, a new option - services.printing.gutenprint is added to enable automatic - updating of Gutenprint PPMs; it's greatly recommended to enable it instead - of adding gutenprint to the drivers list. - + services.printing.extraFilesConf should be enough; if + you encounter a situation when they are not, please file a bug. + + + There are also Gutenprint improvements; in particular, a new option + services.printing.gutenprint is added to enable + automatic updating of Gutenprint PPMs; it's greatly recommended to enable + it instead of adding gutenprint to the + drivers list. + - - services.xserver.vaapiDrivers has been removed. Use - hardware.opengl.extraPackages{,32} instead. You can - also specify VDPAU drivers there. + + services.xserver.vaapiDrivers has been removed. Use + hardware.opengl.extraPackages{,32} instead. You can also + specify VDPAU drivers there. + - - - programs.ibus moved to i18n.inputMethod.ibus. - The option programs.ibus.plugins changed to i18n.inputMethod.ibus.engines - and the option to enable ibus changed from programs.ibus.enable to + + programs.ibus moved to + i18n.inputMethod.ibus. The option + programs.ibus.plugins changed to + i18n.inputMethod.ibus.engines and the option to enable + ibus changed from programs.ibus.enable to i18n.inputMethod.enabled. - i18n.inputMethod.enabled should be set to the used input method name, - "ibus" for ibus. - An example of the new style: - + i18n.inputMethod.enabled should be set to the used input + method name, "ibus" for ibus. An example of the new + style: i18n.inputMethod.enabled = "ibus"; i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; - -That is equivalent to the old version: - + That is equivalent to the old version: programs.ibus.enable = true; programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; - - + - - services.udev.extraRules option now writes rules - to 99-local.rules instead of 10-local.rules. - This makes all the user rules apply after others, so their results wouldn't be - overriden by anything else. + + services.udev.extraRules option now writes rules to + 99-local.rules instead of + 10-local.rules. This makes all the user rules apply + after others, so their results wouldn't be overriden by anything else. + - - Large parts of the services.gitlab module has been - been rewritten. There are new configuration options available. The + + Large parts of the services.gitlab module has been been + rewritten. There are new configuration options available. The stateDir option was renamned to - statePath and the satellitesDir option - was removed. Please review the currently available options. + statePath and the satellitesDir + option was removed. Please review the currently available options. + - - - The option no - longer interpret the dollar sign ($) as a shell variable, as such it - should not be escaped anymore. Thus the following zone data: - - + + The option no longer + interpret the dollar sign ($) as a shell variable, as such it should not be + escaped anymore. Thus the following zone data: + + \$ORIGIN example.com. \$TTL 1800 @ IN SOA ns1.vpn.nbp.name. admin.example.com. ( - + Should modified to look like the actual file expected by nsd: - - + + $ORIGIN example.com. $TTL 1800 @ IN SOA ns1.vpn.nbp.name. admin.example.com. ( - - - service.syncthing.dataDir options now has to point - to exact folder where syncthing is writing to. Example configuration should + + service.syncthing.dataDir options now has to point to + exact folder where syncthing is writing to. Example configuration should look something like: - - + + services.syncthing = { enable = true; dataDir = "/home/somebody/.syncthing"; @@ -358,76 +579,73 @@ services.syncthing = { }; - - - networking.firewall.allowPing is now enabled by - default. Users are encouraged to configure an appropriate rate limit for - their machines using the Kernel interface at - /proc/sys/net/ipv4/icmp_ratelimit and - /proc/sys/net/ipv6/icmp/ratelimit or using the - firewall itself, i.e. by setting the NixOS option - networking.firewall.pingLimit. - + + networking.firewall.allowPing is now enabled by default. + Users are encouraged to configure an appropriate rate limit for their + machines using the Kernel interface at + /proc/sys/net/ipv4/icmp_ratelimit and + /proc/sys/net/ipv6/icmp/ratelimit or using the + firewall itself, i.e. by setting the NixOS option + networking.firewall.pingLimit. + - - - Systems with some broadcom cards used to result into a generated config - that is no longer accepted. If you get errors like - error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created - you should either re-run nixos-generate-config or manually replace - "${config.boot.kernelPackages.broadcom_sta}" - by - config.boot.kernelPackages.broadcom_sta - in your /etc/nixos/hardware-configuration.nix. - More discussion is on - the github issue. - + + Systems with some broadcom cards used to result into a generated config + that is no longer accepted. If you get errors like +error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created + you should either re-run nixos-generate-config or + manually replace + "${config.boot.kernelPackages.broadcom_sta}" by + config.boot.kernelPackages.broadcom_sta in your + /etc/nixos/hardware-configuration.nix. More discussion + is on the + github issue. + - - - The services.xserver.startGnuPGAgent option has been removed. - GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no - longer requires (or even supports) the "start everything as a child of the - agent" scheme we've implemented in NixOS for older versions. - To configure the gpg-agent for your X session, add the following code to - ~/.bashrc or some file that’s sourced when your shell is started: - + + The services.xserver.startGnuPGAgent option has been + removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new + approach no longer requires (or even supports) the "start everything as a + child of the agent" scheme we've implemented in NixOS for older versions. + To configure the gpg-agent for your X session, add the following code to + ~/.bashrc or some file that’s sourced when your + shell is started: + GPG_TTY=$(tty) export GPG_TTY - If you want to use gpg-agent for SSH, too, add the following to your session - initialization (e.g. displayManager.sessionCommands) - + If you want to use gpg-agent for SSH, too, add the following to your + session initialization (e.g. + displayManager.sessionCommands) + gpg-connect-agent /bye unset SSH_AGENT_PID export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh" - and make sure that - + and make sure that + enable-ssh-support - is included in your ~/.gnupg/gpg-agent.conf. - You will need to use ssh-add to re-add your ssh keys. - If gpg’s automatic transformation of the private keys to the new format fails, - you will need to re-import your private keyring as well: - + is included in your ~/.gnupg/gpg-agent.conf. You will + need to use ssh-add to re-add your ssh keys. If gpg’s + automatic transformation of the private keys to the new format fails, you + will need to re-import your private keyring as well: + gpg --import ~/.gnupg/secring.gpg - The gpg-agent(1) man page has more details about this subject, - i.e. in the "EXAMPLES" section. - + The gpg-agent(1) man page has more details about this + subject, i.e. in the "EXAMPLES" section. + - + - -Other notable improvements: - - - - - - - ejabberd module is brought back and now works on - NixOS. - - - - Input method support was improved. New NixOS modules (fcitx, nabi and uim), - fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n) - have been added. - - - - + + + ejabberd module is brought back and now works on NixOS. + + + + + Input method support was improved. New NixOS modules (fcitx, nabi and + uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus + engines (hangul and m17n) have been added. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 893f894f42fe..4a2343edc970 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -3,237 +3,275 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-16.09"> + Release 16.09 (“Flounder”, 2016/09/30) -Release 16.09 (“Flounder”, 2016/09/30) - -In addition to numerous new and upgraded packages, this release -has the following highlights: - - + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + - Many NixOS configurations and Nix packages now use - significantly less disk space, thanks to the + Many NixOS configurations and Nix packages now use significantly less disk + space, thanks to the + extensive - work on closure size reduction. For example, the closure - size of a minimal NixOS container went down from ~424 MiB in 16.03 - to ~212 MiB in 16.09, while the closure size of Firefox went from - ~651 MiB to ~259 MiB. + work on closure size reduction. For example, the closure size of a + minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in + 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB. + - - To improve security, packages are now + To improve security, packages are now + built - using various hardening features. See the Nixpkgs manual - for more information. + using various hardening features. See the Nixpkgs manual for more + information. + - - Support for PXE netboot. See for documentation. + + Support for PXE netboot. See + for documentation. + - - X.org server 1.18. If you use the - ati_unfree driver, 1.17 is still used due to an - ABI incompatibility. + + X.org server 1.18. If you use the ati_unfree driver, + 1.17 is still used due to an ABI incompatibility. + - - This release is based on Glibc 2.24, GCC 5.4.0 and systemd - 231. The default Linux kernel remains 4.4. + + This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default + Linux kernel remains 4.4. + + - - -The following new services were added since the last release: - - - (this will get automatically generated at release time) - - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - + + The following new services were added since the last release: + + - A large number of packages have been converted to use the multiple outputs feature - of Nix to greatly reduce the amount of required disk space, as - mentioned above. This may require changes - to any custom packages to make them build again; see the relevant chapter in the - Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions - related to multiple-output packages - were changed - late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.) - + + (this will get automatically generated at release time) + + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + - Previous versions of Nixpkgs had support for all versions of the LTS + + A large number of packages have been converted to use the multiple outputs + feature of Nix to greatly reduce the amount of required disk space, as + mentioned above. This may require changes to any custom packages to make + them build again; see the relevant chapter in the Nixpkgs manual for more + information. (Additional caveat to packagers: some packaging conventions + related to multiple-output packages + were + changed late (August 2016) in the release cycle and differ from the + initial introduction of multiple outputs.) + + + + + Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided haskell.packages.lts-x_y package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will - drop those old names entirely. The motivation for this change has been discussed at length on the - nix-dev mailing list and in Github issue - #14897. Development strategies for Haskell hackers who want to rely - on Nix and NixOS have been described in nix-dev mailing list and in + Github + issue #14897. Development strategies for Haskell hackers who want to + rely on Nix and NixOS have been described in + another - nix-dev article. + nix-dev article. + - - Shell aliases for systemd sub-commands - were dropped: - start, stop, - restart, status. + + Shell aliases for systemd sub-commands + were + dropped: start, stop, + restart, status. + - - Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default - behavior of Redis 3.2 + + Redis now binds to 127.0.0.1 only instead of listening to all network + interfaces. This is the default behavior of Redis 3.2 + - - - /var/empty is now immutable. Activation script runs chattr +i - to forbid any modifications inside the folder. See - the pull request for what bugs this caused. - + + /var/empty is now immutable. Activation script runs + chattr +i to forbid any modifications inside the folder. + See the + pull request for what bugs this caused. + - - Gitlab's maintainance script - gitlab-runner was removed and split up into the - more clearer gitlab-run and + + Gitlab's maintainance script gitlab-runner was removed + and split up into the more clearer gitlab-run and gitlab-rake scripts, because - gitlab-runner is a component of Gitlab - CI. + gitlab-runner is a component of Gitlab CI. + - - services.xserver.libinput.accelProfile default - changed from flat to adaptive, - as per - official documentation. + + services.xserver.libinput.accelProfile default changed + from flat to adaptive, as per + + official documentation. + - - fonts.fontconfig.ultimate.rendering was removed - because our presets were obsolete for some time. New presets are hardcoded - into FreeType; you can select a preset via fonts.fontconfig.ultimate.preset. - You can customize those presets via ordinary environment variables, using - environment.variables. + + fonts.fontconfig.ultimate.rendering was removed because + our presets were obsolete for some time. New presets are hardcoded into + FreeType; you can select a preset via + fonts.fontconfig.ultimate.preset. You can customize + those presets via ordinary environment variables, using + environment.variables. + - - The audit service is no longer enabled by default. - Use security.audit.enable = true to explicitly enable it. + + The audit service is no longer enabled by default. Use + security.audit.enable = true to explicitly enable it. + - - - pkgs.linuxPackages.virtualbox now contains only the - kernel modules instead of the VirtualBox user space binaries. - If you want to reference the user space binaries, you have to use the new - pkgs.virtualbox instead. - + + pkgs.linuxPackages.virtualbox now contains only the + kernel modules instead of the VirtualBox user space binaries. If you want + to reference the user space binaries, you have to use the new + pkgs.virtualbox instead. + - - goPackages was replaced with separated Go - applications in appropriate nixpkgs - categories. Each Go package uses its own dependency set. There's - also a new go2nix tool introduced to generate a - Go package definition from its Go source automatically. + + goPackages was replaced with separated Go applications + in appropriate nixpkgs categories. Each Go package uses + its own dependency set. There's also a new go2nix tool + introduced to generate a Go package definition from its Go source + automatically. + - - services.mongodb.extraConfig configuration format - was changed to YAML. + + services.mongodb.extraConfig configuration format was + changed to YAML. + - - - PHP has been upgraded to 7.0 - + + PHP has been upgraded to 7.0 + - + + + Other notable improvements: + -Other notable improvements: - - - - Revamped grsecurity/PaX support. There is now only a single - general-purpose distribution kernel and the configuration interface has been - streamlined. Desktop users should be able to simply set - security.grsecurity.enable = true to get - a reasonably secure system without having to sacrifice too much - functionality. - - - Special filesystems, like /proc, - /run and others, now have the same mount options - as recommended by systemd and are unified across different places in - NixOS. Mount options are updated during nixos-rebuild - switch if possible. One benefit from this is improved - security — most such filesystems are now mounted with - noexec, nodev and/or - nosuid options. - - The reverse path filter was interfering with DHCPv4 server - operation in the past. An exception for DHCPv4 and a new option to log - packets that were dropped due to the reverse path filter was added - (networking.firewall.logReversePathDrops) for easier - debugging. - - Containers configuration within - containers.<name>.config is + + + Revamped grsecurity/PaX support. There is now only a single general-purpose + distribution kernel and the configuration interface has been streamlined. + Desktop users should be able to simply set +security.grsecurity.enable = true + to get a reasonably secure system without having to sacrifice too much + functionality. + + + + + Special filesystems, like /proc, /run + and others, now have the same mount options as recommended by systemd and + are unified across different places in NixOS. Mount options are updated + during nixos-rebuild switch if possible. One benefit + from this is improved security — most such filesystems are now mounted + with noexec, nodev and/or + nosuid options. + + + + + The reverse path filter was interfering with DHCPv4 server operation in the + past. An exception for DHCPv4 and a new option to log packets that were + dropped due to the reverse path filter was added + (networking.firewall.logReversePathDrops) for easier + debugging. + + + + + Containers configuration within + containers.<name>.config is + now - properly typed and checked. In particular, partial - configurations are merged correctly. - + properly typed and checked. In particular, partial configurations + are merged correctly. + + - The directory container setuid wrapper programs, - /var/setuid-wrappers, + The directory container setuid wrapper programs, + /var/setuid-wrappers, + is now - updated atomically to prevent failures if the switch to a new - configuration is interrupted. + updated atomically to prevent failures if the switch to a new configuration + is interrupted. + - - services.xserver.startGnuPGAgent - has been removed due to GnuPG 2.1.x bump. See + services.xserver.startGnuPGAgent has been removed due to + GnuPG 2.1.x bump. See + - how to achieve similar behavior. You might need to - pkill gpg-agent after the upgrade - to prevent a stale agent being in the way. - + how to achieve similar behavior. You might need to pkill + gpg-agent after the upgrade to prevent a stale agent being in the + way. + - - + + - Declarative users could share the uid due to the bug in - the script handling conflict resolution. - - - - + Declarative users could share the uid due to the bug in the script handling + conflict resolution. + + + + Gummi boot has been replaced using systemd-boot. - - - + + + + Hydra package and NixOS module were added for convenience. - - - - - + + + diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 6147b9830137..6ca79e2bc00d 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -3,259 +3,588 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-17.03"> + Release 17.03 (“Gorilla”, 2017/03/31) -Release 17.03 (“Gorilla”, 2017/03/31) - -
+ Highlights -Highlights + + In addition to numerous new and upgraded packages, this release has the + following highlights: + -In addition to numerous new and upgraded packages, this release -has the following highlights: - - - - Nixpkgs is now extensible through overlays. See the Nixpkgs - manual for more information. - - - - This release is based on Glibc 2.25, GCC 5.4.0 and systemd - 232. The default Linux kernel is 4.9 and Nix is at 1.11.8. - - - - The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed - - - - The setuid wrapper functionality now supports setting - capabilities. - - - - X.org server uses branch 1.19. Due to ABI incompatibilities, - ati_unfree keeps forcing 1.17 - and amdgpu-pro starts forcing 1.18. - - - + + - Cross compilation has been rewritten. See the nixpkgs manual for - details. The most obvious breaking change is that in derivations there is no - .nativeDrv nor .crossDrv are now - cross by default, not native. + Nixpkgs is now extensible through overlays. See the + Nixpkgs + manual for more information. - - - - The overridePackages function has been rewritten - to be replaced by + + + This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The + default Linux kernel is 4.9 and Nix is at 1.11.8. + + + + + The default desktop environment now is KDE's Plasma 5. KDE 4 has been + removed + + + + + The setuid wrapper functionality now supports setting capabilities. + + + + + X.org server uses branch 1.19. Due to ABI incompatibilities, + ati_unfree keeps forcing 1.17 and + amdgpu-pro starts forcing 1.18. + + + + + Cross compilation has been rewritten. See the nixpkgs manual for details. + The most obvious breaking change is that in derivations there is no + .nativeDrv nor .crossDrv are now + cross by default, not native. + + + + + The overridePackages function has been rewritten to be + replaced by + - overlays - - - - Packages in nixpkgs can be marked as insecure through listed - vulnerabilities. See the + + + + + Packages in nixpkgs can be marked as insecure through listed + vulnerabilities. See the + Nixpkgs - manual for more information. - + manual for more information. + + + + + PHP now defaults to PHP 7.1 + + + +
- - PHP now defaults to PHP 7.1 - - - - - -
+ New Services -New Services + + The following new services were added since the last release: + -The following new services were added since the last release: + + + + hardware/ckb.nix + + + + + hardware/mcelog.nix + + + + + hardware/usb-wwan.nix + + + + + hardware/video/capture/mwprocapture.nix + + + + + programs/adb.nix + + + + + programs/chromium.nix + + + + + programs/gphoto2.nix + + + + + programs/java.nix + + + + + programs/mtr.nix + + + + + programs/oblogout.nix + + + + + programs/vim.nix + + + + + programs/wireshark.nix + + + + + security/dhparams.nix + + + + + services/audio/ympd.nix + + + + + services/computing/boinc/client.nix + + + + + services/continuous-integration/buildbot/master.nix + + + + + services/continuous-integration/buildbot/worker.nix + + + + + services/continuous-integration/gitlab-runner.nix + + + + + services/databases/riak-cs.nix + + + + + services/databases/stanchion.nix + + + + + services/desktops/gnome3/gnome-terminal-server.nix + + + + + services/editors/infinoted.nix + + + + + services/hardware/illum.nix + + + + + services/hardware/trezord.nix + + + + + services/logging/journalbeat.nix + + + + + services/mail/offlineimap.nix + + + + + services/mail/postgrey.nix + + + + + services/misc/couchpotato.nix + + + + + services/misc/docker-registry.nix + + + + + services/misc/errbot.nix + + + + + services/misc/geoip-updater.nix + + + + + services/misc/gogs.nix + + + + + services/misc/leaps.nix + + + + + services/misc/nix-optimise.nix + + + + + services/misc/ssm-agent.nix + + + + + services/misc/sssd.nix + + + + + services/monitoring/arbtt.nix + + + + + services/monitoring/netdata.nix + + + + + services/monitoring/prometheus/default.nix + + + + + services/monitoring/prometheus/alertmanager.nix + + + + + services/monitoring/prometheus/blackbox-exporter.nix + + + + + services/monitoring/prometheus/json-exporter.nix + + + + + services/monitoring/prometheus/nginx-exporter.nix + + + + + services/monitoring/prometheus/node-exporter.nix + + + + + services/monitoring/prometheus/snmp-exporter.nix + + + + + services/monitoring/prometheus/unifi-exporter.nix + + + + + services/monitoring/prometheus/varnish-exporter.nix + + + + + services/monitoring/sysstat.nix + + + + + services/monitoring/telegraf.nix + + + + + services/monitoring/vnstat.nix + + + + + services/network-filesystems/cachefilesd.nix + + + + + services/network-filesystems/glusterfs.nix + + + + + services/network-filesystems/ipfs.nix + + + + + services/networking/dante.nix + + + + + services/networking/dnscrypt-wrapper.nix + + + + + services/networking/fakeroute.nix + + + + + services/networking/flannel.nix + + + + + services/networking/htpdate.nix + + + + + services/networking/miredo.nix + + + + + services/networking/nftables.nix + + + + + services/networking/powerdns.nix + + + + + services/networking/pdns-recursor.nix + + + + + services/networking/quagga.nix + + + + + services/networking/redsocks.nix + + + + + services/networking/wireguard.nix + + + + + services/system/cgmanager.nix + + + + + services/torrent/opentracker.nix + + + + + services/web-apps/atlassian/confluence.nix + + + + + services/web-apps/atlassian/crowd.nix + + + + + services/web-apps/atlassian/jira.nix + + + + + services/web-apps/frab.nix + + + + + services/web-apps/nixbot.nix + + + + + services/web-apps/selfoss.nix + + + + + services/web-apps/quassel-webserver.nix + + + + + services/x11/unclutter-xfixes.nix + + + + + services/x11/urxvtd.nix + + + + + system/boot/systemd-nspawn.nix + + + + + virtualisation/ecs-agent.nix + + + + + virtualisation/lxcfs.nix + + + + + virtualisation/openstack/keystone.nix + + + + + virtualisation/openstack/glance.nix + + + +
- - hardware/ckb.nix - hardware/mcelog.nix - hardware/usb-wwan.nix - hardware/video/capture/mwprocapture.nix - programs/adb.nix - programs/chromium.nix - programs/gphoto2.nix - programs/java.nix - programs/mtr.nix - programs/oblogout.nix - programs/vim.nix - programs/wireshark.nix - security/dhparams.nix - services/audio/ympd.nix - services/computing/boinc/client.nix - services/continuous-integration/buildbot/master.nix - services/continuous-integration/buildbot/worker.nix - services/continuous-integration/gitlab-runner.nix - services/databases/riak-cs.nix - services/databases/stanchion.nix - services/desktops/gnome3/gnome-terminal-server.nix - services/editors/infinoted.nix - services/hardware/illum.nix - services/hardware/trezord.nix - services/logging/journalbeat.nix - services/mail/offlineimap.nix - services/mail/postgrey.nix - services/misc/couchpotato.nix - services/misc/docker-registry.nix - services/misc/errbot.nix - services/misc/geoip-updater.nix - services/misc/gogs.nix - services/misc/leaps.nix - services/misc/nix-optimise.nix - services/misc/ssm-agent.nix - services/misc/sssd.nix - services/monitoring/arbtt.nix - services/monitoring/netdata.nix - services/monitoring/prometheus/default.nix - services/monitoring/prometheus/alertmanager.nix - services/monitoring/prometheus/blackbox-exporter.nix - services/monitoring/prometheus/json-exporter.nix - services/monitoring/prometheus/nginx-exporter.nix - services/monitoring/prometheus/node-exporter.nix - services/monitoring/prometheus/snmp-exporter.nix - services/monitoring/prometheus/unifi-exporter.nix - services/monitoring/prometheus/varnish-exporter.nix - services/monitoring/sysstat.nix - services/monitoring/telegraf.nix - services/monitoring/vnstat.nix - services/network-filesystems/cachefilesd.nix - services/network-filesystems/glusterfs.nix - services/network-filesystems/ipfs.nix - services/networking/dante.nix - services/networking/dnscrypt-wrapper.nix - services/networking/fakeroute.nix - services/networking/flannel.nix - services/networking/htpdate.nix - services/networking/miredo.nix - services/networking/nftables.nix - services/networking/powerdns.nix - services/networking/pdns-recursor.nix - services/networking/quagga.nix - services/networking/redsocks.nix - services/networking/wireguard.nix - services/system/cgmanager.nix - services/torrent/opentracker.nix - services/web-apps/atlassian/confluence.nix - services/web-apps/atlassian/crowd.nix - services/web-apps/atlassian/jira.nix - services/web-apps/frab.nix - services/web-apps/nixbot.nix - services/web-apps/selfoss.nix - services/web-apps/quassel-webserver.nix - services/x11/unclutter-xfixes.nix - services/x11/urxvtd.nix - system/boot/systemd-nspawn.nix - virtualisation/ecs-agent.nix - virtualisation/lxcfs.nix - virtualisation/openstack/keystone.nix - virtualisation/openstack/glance.nix - - - -
+ Backward Incompatibilities -Backward Incompatibilities + + When upgrading from a previous release, please be aware of the following + incompatible changes: + -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - + + - Derivations have no .nativeDrv nor .crossDrv - and are now cross by default, not native. + Derivations have no .nativeDrv nor + .crossDrv and are now cross by default, not native. - - - + + - stdenv.overrides is now expected to take self - and super arguments. See lib.trivial.extends - for what those parameters represent. + stdenv.overrides is now expected to take + self and super arguments. See + lib.trivial.extends for what those parameters + represent. - - - + + - ansible now defaults to ansible version 2 as version 1 - has been removed due to a serious ansible now defaults to ansible version 2 as version 1 + has been removed due to a serious + - vulnerability unpatched by upstream. + vulnerability unpatched by upstream. - - - + + - gnome alias has been removed along with - gtk, gtkmm and several others. - Now you need to use versioned attributes, like gnome3. + gnome alias has been removed along with + gtk, gtkmm and several others. Now + you need to use versioned attributes, like gnome3. - - - + + - The attribute name of the Radicale daemon has been changed from - pythonPackages.radicale to - radicale. + The attribute name of the Radicale daemon has been changed from + pythonPackages.radicale to radicale. - - - + + - The stripHash bash function in stdenv - changed according to its documentation; it now outputs the stripped name to - stdout instead of putting it in the variable - strippedName. + The stripHash bash function in + stdenv changed according to its documentation; it now + outputs the stripped name to stdout instead of putting + it in the variable strippedName. - - - - PHP now scans for extra configuration .ini files in /etc/php.d - instead of /etc. This prevents accidentally loading non-PHP .ini files - that may be in /etc. - - - - + + - Two lone top-level dict dbs moved into dictdDBs. This - affects: dictdWordnet which is now at - dictdDBs.wordnet and dictdWiktionary - which is now at dictdDBs.wiktionary + PHP now scans for extra configuration .ini files in /etc/php.d instead of + /etc. This prevents accidentally loading non-PHP .ini files that may be in + /etc. - - - + + - Parsoid service now uses YAML configuration format. + Two lone top-level dict dbs moved into dictdDBs. This + affects: dictdWordnet which is now at + dictdDBs.wordnet and dictdWiktionary + which is now at dictdDBs.wiktionary + + + + + Parsoid service now uses YAML configuration format. service.parsoid.interwikis is now called service.parsoid.wikis and is a list of either API URLs or attribute sets as specified in parsoid's documentation. - - - + + Ntpd was replaced by systemd-timesyncd as the default service to synchronize @@ -263,14 +592,12 @@ following incompatible changes: setting services.ntp.enable to true. Upstream time servers for all NTP implementations are now configured using networking.timeServers. - - - - + + + - service.nylon is now declared using named instances. - As an example: - + service.nylon is now declared using named instances. As + an example: services.nylon = { enable = true; @@ -279,9 +606,7 @@ following incompatible changes: port = 5912; }; - - should be replaced with: - + should be replaced with: services.nylon.myvpn = { enable = true; @@ -290,225 +615,203 @@ following incompatible changes: port = 5912; }; - - this enables you to declare a SOCKS proxy for each uplink. - + this enables you to declare a SOCKS proxy for each uplink. - - - - overridePackages function no longer exists. - It is replaced by + + + overridePackages function no longer exists. It is + replaced by + - overlays. For example, the following code: - + overlays. For example, the following code: let pkgs = import <nixpkgs> {}; in pkgs.overridePackages (self: super: ...) - - should be replaced by: - + should be replaced by: let pkgs = import <nixpkgs> {}; in import pkgs.path { overlays = [(self: super: ...)]; } - - - - + + - Autoloading connection tracking helpers is now disabled by default. - This default was also changed in the Linux kernel and is considered - insecure if not configured properly in your firewall. If you need - connection tracking helpers (i.e. for active FTP) please enable - networking.firewall.autoLoadConntrackHelpers and - tune networking.firewall.connectionTrackingModules - to suit your needs. + Autoloading connection tracking helpers is now disabled by default. This + default was also changed in the Linux kernel and is considered insecure if + not configured properly in your firewall. If you need connection tracking + helpers (i.e. for active FTP) please enable + networking.firewall.autoLoadConntrackHelpers and tune + networking.firewall.connectionTrackingModules to suit + your needs. - - - + + - local_recipient_maps is not set to empty value by - Postfix service. It's an insecure default as stated by Postfix - documentation. Those who want to retain this setting need to set it via - services.postfix.extraConfig. + local_recipient_maps is not set to empty value by + Postfix service. It's an insecure default as stated by Postfix + documentation. Those who want to retain this setting need to set it via + services.postfix.extraConfig. - - - + + - Iputils no longer provide ping6 and traceroute6. The functionality of - these tools has been integrated into ping and traceroute respectively. To - enforce an address family the new flags -4 and - -6 have been added. One notable incompatibility is that - specifying an interface (for link-local IPv6 for instance) is no longer done - with the -I flag, but by encoding the interface into the - address (ping fe80::1%eth0). + Iputils no longer provide ping6 and traceroute6. The functionality of + these tools has been integrated into ping and traceroute respectively. To + enforce an address family the new flags -4 and + -6 have been added. One notable incompatibility is that + specifying an interface (for link-local IPv6 for instance) is no longer + done with the -I flag, but by encoding the interface + into the address (ping fe80::1%eth0). - - - + + - The socket handling of the services.rmilter module - has been fixed and refactored. As rmilter doesn't support binding to - more than one socket, the options bindUnixSockets - and bindInetSockets have been replaced by - services.rmilter.bindSocket.*. The default is still - a unix socket in /run/rmilter/rmilter.sock. Refer to - the options documentation for more information. + The socket handling of the services.rmilter module has + been fixed and refactored. As rmilter doesn't support binding to more than + one socket, the options bindUnixSockets and + bindInetSockets have been replaced by + services.rmilter.bindSocket.*. The default is still a + unix socket in /run/rmilter/rmilter.sock. Refer to the + options documentation for more information. - - - + + - The fetch* functions no longer support md5, - please use sha256 instead. + The fetch* functions no longer support md5, please use + sha256 instead. - - - + + - The dnscrypt-proxy module interface has been streamlined around the - option. Where possible, legacy option - declarations are mapped to but will emit - warnings. The has been outright - removed: to use an unlisted resolver, use the - option. + The dnscrypt-proxy module interface has been streamlined around the + option. Where possible, legacy option + declarations are mapped to but will emit + warnings. The has been outright removed: to + use an unlisted resolver, use the option. - - - + + - torbrowser now stores local state under - ~/.local/share/tor-browser by default. Any - browser profile data from the old location, - ~/.torbrowser4, must be migrated manually. + torbrowser now stores local state under + ~/.local/share/tor-browser by default. Any browser + profile data from the old location, ~/.torbrowser4, + must be migrated manually. - - - + + - The ihaskell, monetdb, offlineimap and sitecopy services have been removed. + The ihaskell, monetdb, offlineimap and sitecopy services have been + removed. - - + + +
- -
+ Other Notable Changes -Other Notable Changes - - - - - Module type system have a new extensible option types feature that - allow to extend certain types, such as enum, through multiple option - declarations of the same option across multiple modules. - - - - + + - jre now defaults to GTK+ UI by default. This - improves visual consistency and makes Java follow system font style, - improving the situation on HighDPI displays. This has a cost of increased - closure size; for server and other headless workloads it's recommended to - use jre_headless. + Module type system have a new extensible option types feature that allow + to extend certain types, such as enum, through multiple option + declarations of the same option across multiple modules. - - - - Python 2.6 interpreter and package set have been removed. - - - + + - The Python 2.7 interpreter does not use modules anymore. Instead, all - CPython interpreters now include the whole standard library except for `tkinter`, - which is available in the Python package set. + jre now defaults to GTK+ UI by default. This improves + visual consistency and makes Java follow system font style, improving the + situation on HighDPI displays. This has a cost of increased closure size; + for server and other headless workloads it's recommended to use + jre_headless. - - - + + - Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. - Minor modifications had to be made to the interpreters in order to generate - deterministic bytecode. This has security implications and is relevant for - those using Python in a nix-shell. See the Nixpkgs manual - for details. + Python 2.6 interpreter and package set have been removed. - - - + + - The Python package sets now use a fixed-point combinator and the sets are - available as attributes of the interpreters. + The Python 2.7 interpreter does not use modules anymore. Instead, all + CPython interpreters now include the whole standard library except for + `tkinter`, which is available in the Python package set. - - - + + - The Python function buildPythonPackage has been improved and can be - used to build from Setuptools source, Flit source, and precompiled Wheels. + Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. + Minor modifications had to be made to the interpreters in order to + generate deterministic bytecode. This has security implications and is + relevant for those using Python in a nix-shell. See the + Nixpkgs manual for details. - - - + + - When adding new or updating current Python libraries, the expressions should be put - in separate files in pkgs/development/python-modules and - called from python-packages.nix. + The Python package sets now use a fixed-point combinator and the sets are + available as attributes of the interpreters. - - - + + - The dnscrypt-proxy service supports synchronizing the list of public - resolvers without working DNS resolution. This fixes issues caused by the - resolver list becoming outdated. It also improves the viability of - DNSCrypt only configurations. + The Python function buildPythonPackage has been + improved and can be used to build from Setuptools source, Flit source, and + precompiled Wheels. - - - + + - Containers using bridged networking no longer lose their connection after - changes to the host networking. + When adding new or updating current Python libraries, the expressions + should be put in separate files in + pkgs/development/python-modules and called from + python-packages.nix. - - - + + - ZFS supports pool auto scrubbing. + The dnscrypt-proxy service supports synchronizing the list of public + resolvers without working DNS resolution. This fixes issues caused by the + resolver list becoming outdated. It also improves the viability of + DNSCrypt only configurations. - - - + + - The bind DNS utilities (e.g. dig) have been split into their own output and - are now also available in pkgs.dnsutils and it is no longer - necessary to pull in all of bind to use them. + Containers using bridged networking no longer lose their connection after + changes to the host networking. - - - + + - Per-user configuration was moved from ~/.nixpkgs to - ~/.config/nixpkgs. The former is still valid for - config.nix for backwards compatibility. + ZFS supports pool auto scrubbing. - - -
+ + + + The bind DNS utilities (e.g. dig) have been split into their own output + and are now also available in pkgs.dnsutils and it is + no longer necessary to pull in all of bind to use them. + + + + + Per-user configuration was moved from ~/.nixpkgs to + ~/.config/nixpkgs. The former is still valid for + config.nix for backwards compatibility. + + + + diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 66f7b01db72a..795c51d2923d 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -3,40 +3,40 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-17.09"> + Release 17.09 (“Hummingbird”, 2017/09/??) -Release 17.09 (“Hummingbird”, 2017/09/??) - -
+ Highlights -Highlights + + In addition to numerous new and upgraded packages, this release has the + following highlights: + -In addition to numerous new and upgraded packages, this release -has the following highlights: - - - + + - The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, - KDE Applications to 17.08.1 and KDE Frameworks to 5.37. + The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE + Applications to 17.08.1 and KDE Frameworks to 5.37. - - + + - The user handling now keeps track of deallocated UIDs/GIDs. When a user - or group is revived, this allows it to be allocated the UID/GID it had before. - A consequence is that UIDs and GIDs are no longer reused. + The user handling now keeps track of deallocated UIDs/GIDs. When a user or + group is revived, this allows it to be allocated the UID/GID it had + before. A consequence is that UIDs and GIDs are no longer reused. - - + + - The module option now - causes the first head specified in this list to be set as the primary - head. Apart from that, it's now possible to also set additional options - by using an attribute set, for example: + The module option now causes + the first head specified in this list to be set as the primary head. Apart + from that, it's now possible to also set additional options by using an + attribute set, for example: { services.xserver.xrandrHeads = [ "HDMI-0" @@ -50,365 +50,664 @@ has the following highlights: ]; } - This will set the DVI-0 output to be the primary head, - even though HDMI-0 is the first head in the list. + This will set the DVI-0 output to be the primary head, + even though HDMI-0 is the first head in the list. - - + + - The handling of SSL in the services.nginx module has - been cleaned up, renaming the misnamed enableSSL to - onlySSL which reflects its original intention. This - is not to be used with the already existing forceSSL - which creates a second non-SSL virtual host redirecting to the SSL - virtual host. This by chance had worked earlier due to specific - implementation details. In case you had specified both please remove - the enableSSL option to keep the previous behaviour. + The handling of SSL in the services.nginx module has + been cleaned up, renaming the misnamed enableSSL to + onlySSL which reflects its original intention. This is + not to be used with the already existing forceSSL which + creates a second non-SSL virtual host redirecting to the SSL virtual host. + This by chance had worked earlier due to specific implementation details. + In case you had specified both please remove the + enableSSL option to keep the previous behaviour. - Another addSSL option has been introduced to configure - both a non-SSL virtual host and an SSL virtual host with the same - configuration. + Another addSSL option has been introduced to configure + both a non-SSL virtual host and an SSL virtual host with the same + configuration. - Options to configure resolver options and - upstream blocks have been introduced. See their information - for further details. + Options to configure resolver options and + upstream blocks have been introduced. See their + information for further details. - The port option has been replaced by a more generic - listen option which makes it possible to specify - multiple addresses, ports and SSL configs dependant on the new SSL - handling mentioned above. + The port option has been replaced by a more generic + listen option which makes it possible to specify + multiple addresses, ports and SSL configs dependant on the new SSL + handling mentioned above. - - + + +
- -
+ New Services -New Services + + The following new services were added since the last release: + -The following new services were added since the last release: + + + + config/fonts/fontconfig-penultimate.nix + + + + + config/fonts/fontconfig-ultimate.nix + + + + + config/terminfo.nix + + + + + hardware/sensor/iio.nix + + + + + hardware/nitrokey.nix + + + + + hardware/raid/hpsa.nix + + + + + programs/browserpass.nix + + + + + programs/gnupg.nix + + + + + programs/qt5ct.nix + + + + + programs/slock.nix + + + + + programs/thefuck.nix + + + + + security/auditd.nix + + + + + security/lock-kernel-modules.nix + + + + + service-managers/docker.nix + + + + + service-managers/trivial.nix + + + + + services/admin/salt/master.nix + + + + + services/admin/salt/minion.nix + + + + + services/audio/slimserver.nix + + + + + services/cluster/kubernetes/default.nix + + + + + services/cluster/kubernetes/dns.nix + + + + + services/cluster/kubernetes/dashboard.nix + + + + + services/continuous-integration/hail.nix + + + + + services/databases/clickhouse.nix + + + + + services/databases/postage.nix + + + + + services/desktops/gnome3/gnome-disks.nix + + + + + services/desktops/gnome3/gpaste.nix + + + + + services/logging/SystemdJournal2Gelf.nix + + + + + services/logging/heartbeat.nix + + + + + services/logging/journalwatch.nix + + + + + services/logging/syslogd.nix + + + + + services/mail/mailhog.nix + + + + + services/mail/nullmailer.nix + + + + + services/misc/airsonic.nix + + + + + services/misc/autorandr.nix + + + + + services/misc/exhibitor.nix + + + + + services/misc/fstrim.nix + + + + + services/misc/gollum.nix + + + + + services/misc/irkerd.nix + + + + + services/misc/jackett.nix + + + + + services/misc/radarr.nix + + + + + services/misc/snapper.nix + + + + + services/monitoring/osquery.nix + + + + + services/monitoring/prometheus/collectd-exporter.nix + + + + + services/monitoring/prometheus/fritzbox-exporter.nix + + + + + services/network-filesystems/kbfs.nix + + + + + services/networking/dnscache.nix + + + + + services/networking/fireqos.nix + + + + + services/networking/iwd.nix + + + + + services/networking/keepalived/default.nix + + + + + services/networking/keybase.nix + + + + + services/networking/lldpd.nix + + + + + services/networking/matterbridge.nix + + + + + services/networking/squid.nix + + + + + services/networking/tinydns.nix + + + + + services/networking/xrdp.nix + + + + + services/security/shibboleth-sp.nix + + + + + services/security/sks.nix + + + + + services/security/sshguard.nix + + + + + services/security/torify.nix + + + + + services/security/usbguard.nix + + + + + services/security/vault.nix + + + + + services/system/earlyoom.nix + + + + + services/system/saslauthd.nix + + + + + services/web-apps/nexus.nix + + + + + services/web-apps/pgpkeyserver-lite.nix + + + + + services/web-apps/piwik.nix + + + + + services/web-servers/lighttpd/collectd.nix + + + + + services/web-servers/minio.nix + + + + + services/x11/display-managers/xpra.nix + + + + + services/x11/xautolock.nix + + + + + tasks/filesystems/bcachefs.nix + + + + + tasks/powertop.nix + + + +
- - config/fonts/fontconfig-penultimate.nix - config/fonts/fontconfig-ultimate.nix - config/terminfo.nix - hardware/sensor/iio.nix - hardware/nitrokey.nix - hardware/raid/hpsa.nix - programs/browserpass.nix - programs/gnupg.nix - programs/qt5ct.nix - programs/slock.nix - programs/thefuck.nix - security/auditd.nix - security/lock-kernel-modules.nix - service-managers/docker.nix - service-managers/trivial.nix - services/admin/salt/master.nix - services/admin/salt/minion.nix - services/audio/slimserver.nix - services/cluster/kubernetes/default.nix - services/cluster/kubernetes/dns.nix - services/cluster/kubernetes/dashboard.nix - services/continuous-integration/hail.nix - services/databases/clickhouse.nix - services/databases/postage.nix - services/desktops/gnome3/gnome-disks.nix - services/desktops/gnome3/gpaste.nix - services/logging/SystemdJournal2Gelf.nix - services/logging/heartbeat.nix - services/logging/journalwatch.nix - services/logging/syslogd.nix - services/mail/mailhog.nix - services/mail/nullmailer.nix - services/misc/airsonic.nix - services/misc/autorandr.nix - services/misc/exhibitor.nix - services/misc/fstrim.nix - services/misc/gollum.nix - services/misc/irkerd.nix - services/misc/jackett.nix - services/misc/radarr.nix - services/misc/snapper.nix - services/monitoring/osquery.nix - services/monitoring/prometheus/collectd-exporter.nix - services/monitoring/prometheus/fritzbox-exporter.nix - services/network-filesystems/kbfs.nix - services/networking/dnscache.nix - services/networking/fireqos.nix - services/networking/iwd.nix - services/networking/keepalived/default.nix - services/networking/keybase.nix - services/networking/lldpd.nix - services/networking/matterbridge.nix - services/networking/squid.nix - services/networking/tinydns.nix - services/networking/xrdp.nix - services/security/shibboleth-sp.nix - services/security/sks.nix - services/security/sshguard.nix - services/security/torify.nix - services/security/usbguard.nix - services/security/vault.nix - services/system/earlyoom.nix - services/system/saslauthd.nix - services/web-apps/nexus.nix - services/web-apps/pgpkeyserver-lite.nix - services/web-apps/piwik.nix - services/web-servers/lighttpd/collectd.nix - services/web-servers/minio.nix - services/x11/display-managers/xpra.nix - services/x11/xautolock.nix - tasks/filesystems/bcachefs.nix - tasks/powertop.nix - - - -
+ Backward Incompatibilities -Backward Incompatibilities + + When upgrading from a previous release, please be aware of the following + incompatible changes: + -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - + + - - In an Qemu-based virtualization environment, the network interface - names changed from i.e. enp0s3 to - ens3. - + In an Qemu-based virtualization environment, the + network interface names changed from i.e. enp0s3 to + ens3. - This is due to a kernel configuration change. The new naming - is consistent with those of other Linux distributions with - systemd. See - #29197 - for more information. + This is due to a kernel configuration change. The new naming is consistent + with those of other Linux distributions with systemd. See + #29197 + for more information. - A machine is affected if the virt-what tool - either returns qemu or - kvm and has - interface names used in any part of its NixOS configuration, - in particular if a static network configuration with - networking.interfaces is used. + A machine is affected if the virt-what tool either + returns qemu or kvm + and has interface names used in any part of its NixOS + configuration, in particular if a static network configuration with + networking.interfaces is used. - Before rebooting affected machines, please ensure: - - - - Change the interface names in your NixOS configuration. - The first interface will be called ens3, - the second one ens8 and starting from there - incremented by 1. - - - - - After changing the interface names, rebuild your system with - nixos-rebuild boot to activate the new - configuration after a reboot. If you switch to the new - configuration right away you might lose network connectivity! - If using nixops, deploy with - nixops deploy --force-reboot. - - - + Before rebooting affected machines, please ensure: + + + + Change the interface names in your NixOS configuration. The first + interface will be called ens3, the second one + ens8 and starting from there incremented by 1. + + + + + After changing the interface names, rebuild your system with + nixos-rebuild boot to activate the new configuration + after a reboot. If you switch to the new configuration right away you + might lose network connectivity! If using nixops, + deploy with nixops deploy --force-reboot. + + + - - + + - The following changes apply if the stateVersion is changed to 17.09 or higher. - For stateVersion = "17.03" or lower the old behavior is preserved. + The following changes apply if the stateVersion is + changed to 17.09 or higher. For stateVersion = "17.03" + or lower the old behavior is preserved. - - - The postgres default version was changed from 9.5 to 9.6. - - - - - The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing. - - - - - The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. - - - - - The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. - - - - - Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration. - - + + + The postgres default version was changed from 9.5 to + 9.6. + + + + + The postgres superuser name has changed from + root to postgres to more closely + follow what other Linux distributions are doing. + + + + + The postgres default dataDir has + changed from /var/db/postgres to + /var/lib/postgresql/$psqlSchema where $psqlSchema is + 9.6 for example. + + + + + The mysql default dataDir has + changed from /var/mysql to + /var/lib/mysql. + + + + + Radicale's default package has changed from 1.x to 2.x. Instructions to + migrate can be found here + . It is also possible to use the newer version by setting the + package to radicale2, which is + done automatically when stateVersion is 17.09 or + higher. The extraArgs option has been added to allow + passing the data migration arguments specified in the instructions; see + the + radicale.nix + NixOS test for an example migration. + + - - + + - The aiccu package was removed. This is due to SixXS - sunsetting its IPv6 tunnel. + The aiccu package was removed. This is due to SixXS + sunsetting its IPv6 + tunnel. - - + + - The fanctl package and fan module - have been removed due to the developers not upstreaming their iproute2 - patches and lagging with compatibility to recent iproute2 versions. + The fanctl package and fan module + have been removed due to the developers not upstreaming their iproute2 + patches and lagging with compatibility to recent iproute2 versions. - - + + - Top-level idea package collection was renamed. - All JetBrains IDEs are now at jetbrains. + Top-level idea package collection was renamed. All + JetBrains IDEs are now at jetbrains. - - + + - flexget's state database cannot be upgraded to its - new internal format, requiring removal of any existing - db-config.sqlite which will be automatically recreated. + flexget's state database cannot be upgraded to its new + internal format, requiring removal of any existing + db-config.sqlite which will be automatically recreated. - - + + - The ipfs service now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with + The ipfs service now doesn't ignore the + dataDir option anymore. If you've ever set this option + to anything other than the default you'll have to either unset it (so the + default gets used) or migrate the old data manually with dataDir=<valueOfDataDir> mv /var/lib/ipfs/.ipfs/* $dataDir rmdir /var/lib/ipfs/.ipfs - - + + - The caddy service was previously using an extra - .caddy directory in the data directory specified - with the dataDir option. The contents of the - .caddy directory are now expected to be in the - dataDir. + The caddy service was previously using an extra + .caddy directory in the data directory specified with + the dataDir option. The contents of the + .caddy directory are now expected to be in the + dataDir. - - + + - The ssh-agent user service is not started by default - anymore. Use programs.ssh.startAgent to enable it if - needed. There is also a new programs.gnupg.agent - module that creates a gpg-agent user service. It can - also serve as a SSH agent if enableSSHSupport is set. + The ssh-agent user service is not started by default + anymore. Use programs.ssh.startAgent to enable it if + needed. There is also a new programs.gnupg.agent module + that creates a gpg-agent user service. It can also + serve as a SSH agent if enableSSHSupport is set. - - + + - The services.tinc.networks.<name>.listenAddress - option had a misleading name that did not correspond to its behavior. It - now correctly defines the ip to listen for incoming connections on. To - keep the previous behaviour, use - services.tinc.networks.<name>.bindToAddress - instead. Refer to the description of the options for more details. + The services.tinc.networks.<name>.listenAddress + option had a misleading name that did not correspond to its behavior. It + now correctly defines the ip to listen for incoming connections on. To + keep the previous behaviour, use + services.tinc.networks.<name>.bindToAddress + instead. Refer to the description of the options for more details. - - + + - tlsdate package and module were removed. This is due to the project - being dead and not building with openssl 1.1. + tlsdate package and module were removed. This is due to + the project being dead and not building with openssl 1.1. - - + + - wvdial package and module were removed. This is due to the project - being dead and not building with openssl 1.1. + wvdial package and module were removed. This is due to + the project being dead and not building with openssl 1.1. - - + + - cc-wrapper's setup-hook now exports a number of - environment variables corresponding to binutils binaries, - (e.g. LD, STRIP, RANLIB, - etc). This is done to prevent packages' build systems guessing, which is - harder to predict, especially when cross-compiling. However, some packages - have broken due to this—their build systems either not supporting, or - claiming to support without adequate testing, taking such environment - variables as parameters. + cc-wrapper's setup-hook now exports a number of + environment variables corresponding to binutils binaries, (e.g. + LD, STRIP, RANLIB, etc). This + is done to prevent packages' build systems guessing, which is harder to + predict, especially when cross-compiling. However, some packages have + broken due to this—their build systems either not supporting, or + claiming to support without adequate testing, taking such environment + variables as parameters. - - + + - services.firefox.syncserver now runs by default as a - non-root user. To accomodate this change, the default sqlite database - location has also been changed. Migration should work automatically. - Refer to the description of the options for more details. + services.firefox.syncserver now runs by default as a + non-root user. To accomodate this change, the default sqlite database + location has also been changed. Migration should work automatically. Refer + to the description of the options for more details. - - + + - The compiz window manager and package was - removed. The system support had been broken for several years. + The compiz window manager and package was removed. The + system support had been broken for several years. - - + + - Touchpad support should now be enabled through - libinput as synaptics is - now deprecated. See the option - services.xserver.libinput.enable. + Touchpad support should now be enabled through libinput + as synaptics is now deprecated. See the option + services.xserver.libinput.enable. - - + + - grsecurity/PaX support has been dropped, following upstream's - decision to cease free support. See - - upstream's announcement for more information. - No complete replacement for grsecurity/PaX is available presently. + grsecurity/PaX support has been dropped, following upstream's decision to + cease free support. See + + upstream's announcement for more information. No complete + replacement for grsecurity/PaX is available presently. - - + + - services.mysql now has declarative - configuration of databases and users with the ensureDatabases and - ensureUsers options. + services.mysql now has declarative configuration of + databases and users with the ensureDatabases and + ensureUsers options. - - These options will never delete existing databases and users, - especially not when the value of the options are changed. + These options will never delete existing databases and users, especially + not when the value of the options are changed. - - The MySQL users will be identified using - - Unix socket authentication. This authenticates the - Unix user with the same name only, and that without the need - for a password. + The MySQL users will be identified using + + Unix socket authentication. This authenticates the Unix user with + the same name only, and that without the need for a password. - - If you have previously created a MySQL root - user with a password, you will need to add - root user for unix socket authentication - before using the new options. This can be done by running the - following SQL script: - + If you have previously created a MySQL root user + with a password, you will need to add + root user for unix socket authentication before using + the new options. This can be done by running the following SQL script: CREATE USER 'root'@'%' IDENTIFIED BY ''; GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; @@ -418,194 +717,183 @@ FLUSH PRIVILEGES; -- DROP USER 'root'@'localhost'; - - - + + - services.mysqlBackup now works by default - without any user setup, including for users other than - mysql. + services.mysqlBackup now works by default without any + user setup, including for users other than mysql. - - By default, the mysql user is no longer the - user which performs the backup. Instead a system account - mysqlbackup is used. + By default, the mysql user is no longer the user which + performs the backup. Instead a system account + mysqlbackup is used. - - The mysqlBackup service is also now using - systemd timers instead of cron. + The mysqlBackup service is also now using systemd + timers instead of cron. - - Therefore, the services.mysqlBackup.period - option no longer exists, and has been replaced with - services.mysqlBackup.calendar, which is in - the format of services.mysqlBackup.period option no + longer exists, and has been replaced with + services.mysqlBackup.calendar, which is in the format + of + systemd.time(7). - - If you expect to be sent an e-mail when the backup fails, - consider using a script which monitors the systemd journal for - errors. Regretfully, at present there is no built-in - functionality for this. + If you expect to be sent an e-mail when the backup fails, consider using a + script which monitors the systemd journal for errors. Regretfully, at + present there is no built-in functionality for this. - - You can check that backups still work by running - systemctl start mysql-backup then - systemctl status mysql-backup. + You can check that backups still work by running systemctl start + mysql-backup then systemctl status + mysql-backup. - - - + + - Templated systemd services e.g container@name are - now handled currectly when switching to a new configuration, resulting - in them being reloaded. + Templated systemd services e.g container@name are now + handled currectly when switching to a new configuration, resulting in them + being reloaded. - - - - Steam: the newStdcpp parameter - was removed and should not be needed anymore. - - - + + - Redis has been updated to version 4 which mandates a cluster - mass-restart, due to changes in the network handling, in order - to ensure compatibility with networks NATing traffic. + Steam: the newStdcpp parameter was removed and should + not be needed anymore. - - + + + + Redis has been updated to version 4 which mandates a cluster mass-restart, + due to changes in the network handling, in order to ensure compatibility + with networks NATing traffic. + + + +
- -
+ Other Notable Changes -Other Notable Changes - - - - + + - Modules can now be disabled by using - disabledModules, allowing another to take it's place. This can be - used to import a set of modules from another channel while keeping the - rest of the system on a stable release. + disabledModules, allowing another to take it's place. This can be + used to import a set of modules from another channel while keeping the + rest of the system on a stable release. - - + + - Updated to FreeType 2.7.1, including a new TrueType engine. - The new engine replaces the Infinality engine which was the default in - NixOS. The default font rendering settings are now provided by - fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults - are less invasive and provide rendering that is more consistent with - other systems and hopefully with each font designer's intent. Some - system-wide configuration has been removed from the Fontconfig NixOS - module where user Fontconfig settings are available. + Updated to FreeType 2.7.1, including a new TrueType engine. The new engine + replaces the Infinality engine which was the default in NixOS. The default + font rendering settings are now provided by fontconfig-penultimate, + replacing fontconfig-ultimate; the new defaults are less invasive and + provide rendering that is more consistent with other systems and hopefully + with each font designer's intent. Some system-wide configuration has been + removed from the Fontconfig NixOS module where user Fontconfig settings + are available. - - + + - ZFS/SPL have been updated to 0.7.0, zfsUnstable, splUnstable - have therefore been removed. + ZFS/SPL have been updated to 0.7.0, zfsUnstable, + splUnstable have therefore been removed. - - + + - The option now allows the value - null in addition to timezone strings. This value - allows changing the timezone of a system imperatively using - timedatectl set-timezone. The default timezone - is still UTC. + The option now allows the value + null in addition to timezone strings. This value allows + changing the timezone of a system imperatively using timedatectl + set-timezone. The default timezone is still UTC. - - + + - Nixpkgs overlays may now be specified with a file as well as a directory. The - value of <nixpkgs-overlays> may be a file, and - ~/.config/nixpkgs/overlays.nix can be used instead of the - ~/.config/nixpkgs/overlays directory. + Nixpkgs overlays may now be specified with a file as well as a directory. + The value of <nixpkgs-overlays> may be a file, and + ~/.config/nixpkgs/overlays.nix can be used instead of + the ~/.config/nixpkgs/overlays directory. - See the overlays chapter of the Nixpkgs manual for more details. + See the overlays chapter of the Nixpkgs manual for more details. - - + + - Definitions for /etc/hosts can now be specified - declaratively with networking.hosts. + Definitions for /etc/hosts can now be specified + declaratively with networking.hosts. - - + + - Two new options have been added to the installer loader, in addition - to the default having changed. The kernel log verbosity has been lowered - to the upstream default for the default options, in order to not spam - the console when e.g. joining a network. + Two new options have been added to the installer loader, in addition to + the default having changed. The kernel log verbosity has been lowered to + the upstream default for the default options, in order to not spam the + console when e.g. joining a network. - This therefore leads to adding a new debug option - to set the log level to the previous verbose mode, to make debugging - easier, but still accessible easily. + This therefore leads to adding a new debug option to + set the log level to the previous verbose mode, to make debugging easier, + but still accessible easily. - Additionally a copytoram option has been added, - which makes it possible to remove the install medium after booting. - This allows tethering from your phone after booting from it. + Additionally a copytoram option has been added, which + makes it possible to remove the install medium after booting. This allows + tethering from your phone after booting from it. - - + + - services.gitlab-runner.configOptions has been added - to specify the configuration of gitlab-runners declaratively. + services.gitlab-runner.configOptions has been added to + specify the configuration of gitlab-runners declaratively. - - + + - services.jenkins.plugins has been added - to install plugins easily, this can be generated with jenkinsPlugins2nix. + services.jenkins.plugins has been added to install + plugins easily, this can be generated with jenkinsPlugins2nix. - - + + - services.postfix.config has been added - to specify the main.cf with NixOS options. Additionally other options - have been added to the postfix module and has been improved further. + services.postfix.config has been added to specify the + main.cf with NixOS options. Additionally other options have been added to + the postfix module and has been improved further. - - + + - The GitLab package and module have been updated to the latest 10.0 - release. + The GitLab package and module have been updated to the latest 10.0 + release. - - + + - The systemd-boot boot loader now lists the NixOS - version, kernel version and build date of all bootable generations. + The systemd-boot boot loader now lists the NixOS + version, kernel version and build date of all bootable generations. - - + + - The dnscrypt-proxy service now defaults to using a random upstream resolver, - selected from the list of public non-logging resolvers with DNSSEC support. - Existing configurations can be migrated to this mode of operation by - omitting the option - or setting it to "random". + The dnscrypt-proxy service now defaults to using a random upstream + resolver, selected from the list of public non-logging resolvers with + DNSSEC support. Existing configurations can be migrated to this mode of + operation by omitting the + option or setting it + to "random". - - - - -
+ + + diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 9221c2951ed2..c14679eea071 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -3,532 +3,822 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-18.03"> + Release 18.03 (“Impala”, 2018/04/04) -Release 18.03 (“Impala”, 2018/04/04) - -
+ Highlights -Highlights + + In addition to numerous new and upgraded packages, this release has the + following highlights: + -In addition to numerous new and upgraded packages, this release -has the following highlights: - - - - + + - End of support is planned for end of October 2018, handing over to 18.09. + End of support is planned for end of October 2018, handing over to 18.09. - - - + + - Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). - Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc. + Platform support: x86_64-linux and x86_64-darwin since release time (the + latter isn't NixOS, really). Binaries for aarch64-linux are available, but + no channel exists yet, as it's waiting for some test fixes, etc. - - - + + - Nix now defaults to 2.0; see its - release notes. + Nix now defaults to 2.0; see its + release + notes. - - - + + - Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237. + Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> + 7, systemd: 234 -> 237. - - - + + - Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12. + Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 + -> 5.12. - - - + + - MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes - have been made to the infrastructure involved: - - - - libmysql has been deprecated, please use mysql.connector-c - instead, a compatibility passthru has been added to the MySQL packages. - - - - - The mysql57 package has a new static output containing - the static libraries including libmysqld.a - - - + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. + While upgrading a few changes have been made to the infrastructure + involved: + + + + libmysql has been deprecated, please use + mysql.connector-c instead, a compatibility passthru + has been added to the MySQL packages. + + + + + The mysql57 package has a new + static output containing the static libraries + including libmysqld.a + + + - + + + + PHP now defaults to PHP 7.2, updated from 7.1. + + + +
- - PHP now defaults to PHP 7.2, updated from 7.1. - - - - -
+ New Services -New Services + + The following new services were added since the last release: + -The following new services were added since the last release: + + + + ./config/krb5/default.nix + + + + + ./hardware/digitalbitbox.nix + + + + + ./misc/label.nix + + + + + ./programs/ccache.nix + + + + + ./programs/criu.nix + + + + + ./programs/digitalbitbox/default.nix + + + + + ./programs/less.nix + + + + + ./programs/npm.nix + + + + + ./programs/plotinus.nix + + + + + ./programs/rootston.nix + + + + + ./programs/systemtap.nix + + + + + ./programs/sway.nix + + + + + ./programs/udevil.nix + + + + + ./programs/way-cooler.nix + + + + + ./programs/yabar.nix + + + + + ./programs/zsh/zsh-autoenv.nix + + + + + ./services/backup/borgbackup.nix + + + + + ./services/backup/crashplan-small-business.nix + + + + + ./services/desktops/dleyna-renderer.nix + + + + + ./services/desktops/dleyna-server.nix + + + + + ./services/desktops/pipewire.nix + + + + + ./services/desktops/gnome3/chrome-gnome-shell.nix + + + + + ./services/desktops/gnome3/tracker-miners.nix + + + + + ./services/hardware/fwupd.nix + + + + + ./services/hardware/interception-tools.nix + + + + + ./services/hardware/u2f.nix + + + + + ./services/hardware/usbmuxd.nix + + + + + ./services/mail/clamsmtp.nix + + + + + ./services/mail/dkimproxy-out.nix + + + + + ./services/mail/pfix-srsd.nix + + + + + ./services/misc/gitea.nix + + + + + ./services/misc/home-assistant.nix + + + + + ./services/misc/ihaskell.nix + + + + + ./services/misc/logkeys.nix + + + + + ./services/misc/novacomd.nix + + + + + ./services/misc/osrm.nix + + + + + ./services/misc/plexpy.nix + + + + + ./services/misc/pykms.nix + + + + + ./services/misc/tzupdate.nix + + + + + ./services/monitoring/fusion-inventory.nix + + + + + ./services/monitoring/prometheus/exporters.nix + + + + + ./services/network-filesystems/beegfs.nix + + + + + ./services/network-filesystems/davfs2.nix + + + + + ./services/network-filesystems/openafs/client.nix + + + + + ./services/network-filesystems/openafs/server.nix + + + + + ./services/network-filesystems/ceph.nix + + + + + ./services/networking/aria2.nix + + + + + ./services/networking/monero.nix + + + + + ./services/networking/nghttpx/default.nix + + + + + ./services/networking/nixops-dns.nix + + + + + ./services/networking/rxe.nix + + + + + ./services/networking/stunnel.nix + + + + + ./services/web-apps/matomo.nix + + + + + ./services/web-apps/restya-board.nix + + + + + ./services/web-servers/mighttpd2.nix + + + + + ./services/x11/fractalart.nix + + + + + ./system/boot/binfmt.nix + + + + + ./system/boot/grow-partition.nix + + + + + ./tasks/filesystems/ecryptfs.nix + + + + + ./virtualisation/hyperv-guest.nix + + + +
- - ./config/krb5/default.nix - ./hardware/digitalbitbox.nix - ./misc/label.nix - ./programs/ccache.nix - ./programs/criu.nix - ./programs/digitalbitbox/default.nix - ./programs/less.nix - ./programs/npm.nix - ./programs/plotinus.nix - ./programs/rootston.nix - ./programs/systemtap.nix - ./programs/sway.nix - ./programs/udevil.nix - ./programs/way-cooler.nix - ./programs/yabar.nix - ./programs/zsh/zsh-autoenv.nix - ./services/backup/borgbackup.nix - ./services/backup/crashplan-small-business.nix - ./services/desktops/dleyna-renderer.nix - ./services/desktops/dleyna-server.nix - ./services/desktops/pipewire.nix - ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/tracker-miners.nix - ./services/hardware/fwupd.nix - ./services/hardware/interception-tools.nix - ./services/hardware/u2f.nix - ./services/hardware/usbmuxd.nix - ./services/mail/clamsmtp.nix - ./services/mail/dkimproxy-out.nix - ./services/mail/pfix-srsd.nix - ./services/misc/gitea.nix - ./services/misc/home-assistant.nix - ./services/misc/ihaskell.nix - ./services/misc/logkeys.nix - ./services/misc/novacomd.nix - ./services/misc/osrm.nix - ./services/misc/plexpy.nix - ./services/misc/pykms.nix - ./services/misc/tzupdate.nix - ./services/monitoring/fusion-inventory.nix - ./services/monitoring/prometheus/exporters.nix - ./services/network-filesystems/beegfs.nix - ./services/network-filesystems/davfs2.nix - ./services/network-filesystems/openafs/client.nix - ./services/network-filesystems/openafs/server.nix - ./services/network-filesystems/ceph.nix - ./services/networking/aria2.nix - ./services/networking/monero.nix - ./services/networking/nghttpx/default.nix - ./services/networking/nixops-dns.nix - ./services/networking/rxe.nix - ./services/networking/stunnel.nix - ./services/web-apps/matomo.nix - ./services/web-apps/restya-board.nix - ./services/web-servers/mighttpd2.nix - ./services/x11/fractalart.nix - ./system/boot/binfmt.nix - ./system/boot/grow-partition.nix - ./tasks/filesystems/ecryptfs.nix - ./virtualisation/hyperv-guest.nix - - - -
+ Backward Incompatibilities -Backward Incompatibilities + + When upgrading from a previous release, please be aware of the following + incompatible changes: + -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - + + - sound.enable now defaults to false. + sound.enable now defaults to false. - - + + - Dollar signs in options under are - passed verbatim to Postfix, which will interpret them as the beginning of - a parameter expression. This was already true for string-valued options - in the previous release, but not for list-valued options. If you need to - pass literal dollar signs through Postfix, double them. + Dollar signs in options under are passed + verbatim to Postfix, which will interpret them as the beginning of a + parameter expression. This was already true for string-valued options in + the previous release, but not for list-valued options. If you need to pass + literal dollar signs through Postfix, double them. - - + + - The postage package (for web-based PostgreSQL - administration) has been renamed to pgmanage. The - corresponding module has also been renamed. To migrate please rename all - options to - . + The postage package (for web-based PostgreSQL + administration) has been renamed to pgmanage. The + corresponding module has also been renamed. To migrate please rename all + options to + . - - + + - Package attributes starting with a digit have been prefixed with an - underscore sign. This is to avoid quoting in the configuration and - other issues with command-line tools like nix-env. - The change affects the following packages: - - - 2048-in-terminal → _2048-in-terminal - - - 90secondportraits → _90secondportraits - - - 2bwm → _2bwm - - - 389-ds-base → _389-ds-base - - + Package attributes starting with a digit have been prefixed with an + underscore sign. This is to avoid quoting in the configuration and other + issues with command-line tools like nix-env. The change + affects the following packages: + + + + 2048-in-terminal → + _2048-in-terminal + + + + + 90secondportraits → + _90secondportraits + + + + + 2bwm → _2bwm + + + + + 389-ds-base → _389-ds-base + + + - - + + - - The OpenSSH service no longer enables support for DSA keys by default, - which could cause a system lock out. Update your keys or, unfavorably, - re-enable DSA support manually. - + The OpenSSH service no longer enables support for + DSA keys by default, which could cause a system lock out. Update your keys + or, unfavorably, re-enable DSA support manually. - - DSA support was - deprecated in OpenSSH 7.0, - due to it being too weak. To re-enable support, add - PubkeyAcceptedKeyTypes +ssh-dss to the end of your - . + DSA support was + deprecated in + OpenSSH 7.0, due to it being too weak. To re-enable support, add + PubkeyAcceptedKeyTypes +ssh-dss to the end of your + . - - After updating the keys to be stronger, anyone still on a pre-17.03 - version is safe to jump to 17.03, as vetted - here. + After updating the keys to be stronger, anyone still on a pre-17.03 + version is safe to jump to 17.03, as vetted + here. - - + + - The openssh package - now includes Kerberos support by default; - the openssh_with_kerberos package - is now a deprecated alias. - If you do not want Kerberos support, - you can do openssh.override { withKerberos = false; }. - Note, this also applies to the openssh_hpn package. + The openssh package now includes Kerberos support by + default; the openssh_with_kerberos package is now a + deprecated alias. If you do not want Kerberos support, you can do + openssh.override { withKerberos = false; }. Note, this + also applies to the openssh_hpn package. - - + + - cc-wrapper has been split in two; there is now also a bintools-wrapper. - The most commonly used files in nix-support are now split between the two wrappers. - Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper. - Other more obscure ones are just moved. + cc-wrapper has been split in two; there is now also a + bintools-wrapper. The most commonly used files in + nix-support are now split between the two wrappers. + Some commonly used ones, like + nix-support/dynamic-linker, are duplicated for + backwards compatability, even though they rightly belong only in + bintools-wrapper. Other more obscure ones are just + moved. - - + + - The propagation logic has been changed. - The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. - - The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. - In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. - Thankfully, that was and is the least used type of dependency. - Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated. - Other types dependencies should be unaffected. + The propagation logic has been changed. The new logic, along with new + types of dependencies that go with, is thoroughly documented in the + "Specifying dependencies" section of the "Standard Environment" chapter of + the nixpkgs manual. + + The old logic isn't but is easy to describe: dependencies were propagated + as the same type of dependency no matter what. In practice, that means + that many propagatedNativeBuildInputs should instead + be propagatedBuildInputs. Thankfully, that was and is + the least used type of dependency. Also, it means that some + propagatedBuildInputs should instead be + depsTargetTargetPropagated. Other types dependencies + should be unaffected. - - + + - lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. + lib.addPassthru drv passthru is removed. Use + lib.extendDerivation true passthru drv instead. - - + + - The memcached service no longer accept dynamic socket - paths via . Unix sockets can be - still enabled by and - will be accessible at /run/memcached/memcached.sock. + The memcached service no longer accept dynamic socket + paths via . Unix sockets can be + still enabled by and + will be accessible at /run/memcached/memcached.sock. - - + + - The hardware.amdHybridGraphics.disable option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports. + The hardware.amdHybridGraphics.disable option was + removed for lack of a maintainer. If you still need this module, you may + wish to include a copy of it from an older version of nixos in your + imports. - - + + - The merging of config options for services.postfix.config - was buggy. Previously, if other options in the Postfix module like - services.postfix.useSrs were set and the user set config - options that were also set by such options, the resulting config wouldn't - include all options that were needed. They are now merged correctly. If - config options need to be overridden, lib.mkForce or - lib.mkOverride can be used. + The merging of config options for + services.postfix.config was buggy. Previously, if other + options in the Postfix module like + services.postfix.useSrs were set and the user set + config options that were also set by such options, the resulting config + wouldn't include all options that were needed. They are now merged + correctly. If config options need to be overridden, + lib.mkForce or lib.mkOverride can be + used. - - + + - The following changes apply if the stateVersion is changed to 18.03 or higher. - For stateVersion = "17.09" or lower the old behavior is preserved. + The following changes apply if the stateVersion is + changed to 18.03 or higher. For stateVersion = "17.09" + or lower the old behavior is preserved. - - - matrix-synapse uses postgresql by default instead of sqlite. - Migration instructions can be found here . - - + + + matrix-synapse uses postgresql by default instead of + sqlite. Migration instructions can be found + + here . + + - - + + - The jid package has been removed, due to maintenance - overhead of a go package having non-versioned dependencies. + The jid package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. - - + + - When using (enabled by default in GNOME), - it now handles all input devices, not just touchpads. As a result, you might need to - re-evaluate any custom Xorg configuration. In particular, - Option "XkbRules" "base" may result in broken keyboard layout. + When using (enabled by default + in GNOME), it now handles all input devices, not just touchpads. As a + result, you might need to re-evaluate any custom Xorg configuration. In + particular, Option "XkbRules" "base" may result in + broken keyboard layout. - - + + - The attic package was removed. A maintained fork called - Borg should be used instead. - Migration instructions can be found - here. + The attic package was removed. A maintained fork called + Borg should be used + instead. Migration instructions can be found + here. - - + + - The Piwik analytics software was renamed to Matomo: - - - The package pkgs.piwik was renamed to pkgs.matomo. - - - The service services.piwik was renamed to services.matomo. - - - - The data directory /var/lib/piwik was renamed to /var/lib/matomo. - All files will be moved automatically on first startup, but you might need to adjust your backup scripts. - - - - - The default for the nginx configuration changed from - piwik.${config.networking.hostName} to - matomo.${config.networking.hostName}.${config.networking.domain} - if is set, - matomo.${config.networking.hostName} if it is not set. - If you change your , remember you'll need to update the - trustedHosts[] array in /var/lib/matomo/config/config.ini.php - as well. - - - - - The piwik user was renamed to matomo. - The service will adjust ownership automatically for files in the data directory. - If you use unix socket authentication, remember to give the new matomo user - access to the database and to change the username to matomo - in the [database] section of /var/lib/matomo/config/config.ini.php. - - - - - If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, - but this is neither enforced nor required. - - - + The Piwik analytics software was renamed to Matomo: + + + + The package pkgs.piwik was renamed to + pkgs.matomo. + + + + + The service services.piwik was renamed to + services.matomo. + + + + + The data directory /var/lib/piwik was renamed to + /var/lib/matomo. All files will be moved + automatically on first startup, but you might need to adjust your + backup scripts. + + + + + The default for the nginx configuration + changed from piwik.${config.networking.hostName} to + matomo.${config.networking.hostName}.${config.networking.domain} + if is set, + matomo.${config.networking.hostName} if it is not + set. If you change your , remember you'll + need to update the trustedHosts[] array in + /var/lib/matomo/config/config.ini.php as well. + + + + + The piwik user was renamed to + matomo. The service will adjust ownership + automatically for files in the data directory. If you use unix socket + authentication, remember to give the new matomo user + access to the database and to change the username to + matomo in the [database] section + of /var/lib/matomo/config/config.ini.php. + + + + + If you named your database `piwik`, you might want to rename it to + `matomo` to keep things clean, but this is neither enforced nor + required. + + + - - + + - nodejs-4_x is end-of-life. - nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. + nodejs-4_x is end-of-life. + nodejs-4_x, nodejs-slim-4_x and + nodePackages_4_x are removed. - - + + - The pump.io NixOS module was removed. - It is now maintained as an - external module. + The pump.io NixOS module was removed. It is now + maintained as an + external + module. - - + + - The Prosody XMPP server has received a major update. The following modules were renamed: - - - - is now - - - - - is now - - - + The Prosody XMPP server has received a major update. The following modules + were renamed: + + + + is now + + + + + + is now + + + + + + Many new modules are now core modules, most notably + and + . + + + The better-performing libevent backend is now enabled + by default. + + + withCommunityModules now passes through the modules to + . Use + withOnlyInstalledCommunityModules for modules that + should not be enabled directly, e.g lib_ldap. + + + + + All prometheus exporter modules are now defined as submodules. The + exporters are configured using + services.prometheus.exporters. + + + +
- - Many new modules are now core modules, most notably - and . - - - - The better-performing libevent backend is now enabled by default. - - - - withCommunityModules now passes through the modules to . - Use withOnlyInstalledCommunityModules for modules that should not be enabled directly, e.g lib_ldap. - - - - - All prometheus exporter modules are now defined as submodules. - The exporters are configured using services.prometheus.exporters. - - - - - -
+ Other Notable Changes -Other Notable Changes - - - + + - ZNC option now defaults to - true. That means that old configuration is not - overwritten by default when update to the znc options are made. + ZNC option now defaults to + true. That means that old configuration is not + overwritten by default when update to the znc options are made. - - + + - The option - has been added for wireless networks with WPA-Enterprise authentication. - There is also a new option to directly - configure wpa_supplicant and - to connect to hidden networks. + The option + has been added for wireless networks with WPA-Enterprise authentication. + There is also a new option to directly + configure wpa_supplicant and to + connect to hidden networks. - - + + - In the module the - following options have been removed: - - - - - - - - - - - - - - - - - - To assign static addresses to an interface the options - and - should be used instead. - The options and have been - renamed to - respectively. - The new options and - have been added to set up static routing. + In the module the + following options have been removed: + + + + + + + + + + + + + + + + + + + + + + + + + + + + To assign static addresses to an interface the options + and should + be used instead. The options and + have been renamed to + respectively. The new options + and have been + added to set up static routing. - - + + - The option is now 127.0.0.1 by default. - Previously the default behaviour was to listen on all interfaces. + The option is now + 127.0.0.1 by default. Previously the default behaviour + was to listen on all interfaces. - - + + - services.btrfs.autoScrub has been added, to - periodically check btrfs filesystems for data corruption. - If there's a correct copy available, it will automatically repair - corrupted blocks. + services.btrfs.autoScrub has been added, to + periodically check btrfs filesystems for data corruption. If there's a + correct copy available, it will automatically repair corrupted blocks. - - + + - displayManager.lightdm.greeters.gtk.clock-format. - has been added, the clock format string (as expected by - strftime, e.g. %H:%M) to use with the lightdm - gtk greeter panel. + displayManager.lightdm.greeters.gtk.clock-format. has + been added, the clock format string (as expected by strftime, e.g. + %H:%M) to use with the lightdm gtk greeter panel. - If set to null the default clock format is used. + If set to null the default clock format is used. - - + + - displayManager.lightdm.greeters.gtk.indicators - has been added, a list of allowed indicator modules to use with - the lightdm gtk greeter panel. + displayManager.lightdm.greeters.gtk.indicators has been + added, a list of allowed indicator modules to use with the lightdm gtk + greeter panel. - Built-in indicators include ~a11y, - ~language, ~session, - ~power, ~clock, - ~host, ~spacer. Unity - indicators can be represented by short name - (e.g. sound, power), - service file name, or absolute path. + Built-in indicators include ~a11y, + ~language, ~session, + ~power, ~clock, + ~host, ~spacer. Unity indicators can + be represented by short name (e.g. sound, + power), service file name, or absolute path. - If set to null the default indicators are - used. + If set to null the default indicators are used. - In order to have the previous default configuration add + In order to have the previous default configuration add services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ "~host" "~spacer" @@ -539,24 +829,27 @@ following incompatible changes: "~power" ]; - to your configuration.nix. + to your configuration.nix. - - + + - The NixOS test driver supports user services declared by systemd.user.services. - The methods waitForUnit, getUnitInfo, startJob - and stopJob provide an optional $user argument for that purpose. + The NixOS test driver supports user services declared by + systemd.user.services. The methods + waitForUnit, getUnitInfo, + startJob and stopJob provide an + optional $user argument for that purpose. - - + + - Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable - completion for the Nix command line tools by installing the - nix-bash-completions package. + Enabling bash completion on NixOS, + programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions + package. - - - -
+ + + diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 0743a05ba38c..ec7b2f107e8e 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -3,153 +3,172 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-18.09"> + Release 18.09 (“Jellyfish”, 2018/09/??) -Release 18.09 (“Jellyfish”, 2018/09/??) - -
+ Highlights -Highlights + + In addition to numerous new and upgraded packages, this release has the + following highlights: + -In addition to numerous new and upgraded packages, this release -has the following highlights: - - - + + - User channels are now in the default NIX_PATH, - allowing users to use their personal nix-channel - defined channels in nix-build and - nix-shell commands, as well as in imports like - import <mychannel>. + User channels are now in the default NIX_PATH, allowing + users to use their personal nix-channel defined + channels in nix-build and nix-shell + commands, as well as in imports like import + <mychannel>. - For example - + + For example + + $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable $ nix-channel --update $ nix-build '<nixpkgsunstable>' -A gitFull $ nix run -f '<nixpkgsunstable>' gitFull $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - - + + +
- -
+ New Services -New Services + + The following new services were added since the last release: + -The following new services were added since the last release: - - - + + - - + + +
- -
+ Backward Incompatibilities -Backward Incompatibilities + + When upgrading from a previous release, please be aware of the following + incompatible changes: + -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - + + - lib.strict is removed. Use builtins.seq instead. + lib.strict is removed. Use + builtins.seq instead. - - + + - The clementine package points now to the free derivation. - clementineFree is removed now and clementineUnfree - points to the package which is bundled with the unfree libspotify package. + The clementine package points now to the free + derivation. clementineFree is removed now and + clementineUnfree points to the package which is bundled + with the unfree libspotify package. - - + + - The netcat package is now taken directly from OpenBSD's - libressl, instead of relying on Debian's fork. The new - version should be very close to the old version, but there are some minor - differences. Importantly, flags like -b, -q, -C, and -Z are no longer - accepted by the nc command. + The netcat package is now taken directly from OpenBSD's + libressl, instead of relying on Debian's fork. The new + version should be very close to the old version, but there are some minor + differences. Importantly, flags like -b, -q, -C, and -Z are no longer + accepted by the nc command. - - + + + + The services.docker-registry.extraConfig object doesn't contain + environment variables anymore. Instead it needs to provide an object structure + that can be mapped onto the YAML configuration defined in the docker/distribution docs. + + + +
- -
+ Other Notable Changes -Other Notable Changes - - - + + - lib.attrNamesToStr has been deprecated. Use - more specific concatenation (lib.concat(Map)StringsSep) - instead. + dockerTools.pullImage relies on image digest + instead of image tag to download the image. The + sha256 of a pulled image has to be updated. - - + + - lib.addErrorContextToAttrs has been deprecated. Use - builtins.addErrorContext directly. + lib.attrNamesToStr has been deprecated. Use more + specific concatenation (lib.concat(Map)StringsSep) + instead. - - + + - lib.showVal has been deprecated. Use - lib.traceSeqN instead. + lib.addErrorContextToAttrs has been deprecated. Use + builtins.addErrorContext directly. - - + + - lib.traceXMLVal has been deprecated. Use - lib.traceValFn builtins.toXml instead. + lib.showVal has been deprecated. Use + lib.traceSeqN instead. - - + + - lib.traceXMLValMarked has been deprecated. Use - lib.traceValFn (x: str + builtins.toXML x) instead. + lib.traceXMLVal has been deprecated. Use + lib.traceValFn builtins.toXml instead. - - + + - lib.traceValIfNot has been deprecated. Use - if/then/else and lib.traceValSeq - instead. + lib.traceXMLValMarked has been deprecated. Use + lib.traceValFn (x: str + builtins.toXML x) instead. - - + + - lib.traceCallXml has been deprecated. Please complain - if you use the function regularly. + lib.traceValIfNot has been deprecated. Use + if/then/else and lib.traceValSeq + instead. + + + + + lib.traceCallXml has been deprecated. Please complain + if you use the function regularly. - The attribute lib.nixpkgsVersion has been deprecated in favor of - lib.version. Please refer to the discussion in - NixOS/nixpkgs#39416 for further reference. + The attribute lib.nixpkgsVersion has been deprecated in + favor of lib.version. Please refer to the discussion in + NixOS/nixpkgs#39416 + for further reference. - - - -
+ + + diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix new file mode 100644 index 000000000000..7f8422b4ec11 --- /dev/null +++ b/nixos/doc/manual/shell.nix @@ -0,0 +1,8 @@ +let + pkgs = import ../../.. { }; +in +pkgs.mkShell { + name = "nixos-manual"; + + buildInputs = with pkgs; [ xmlformat jing xmloscopy ]; +} diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf new file mode 100644 index 000000000000..50255857b24a --- /dev/null +++ b/nixos/doc/xmlformat.conf @@ -0,0 +1,72 @@ +# +# DocBook Configuration file for "xmlformat" +# see http://www.kitebird.com/software/xmlformat/ +# 10 Sept. 2004 +# + +# Only block elements +ackno address appendix article biblioentry bibliography bibliomixed \ +biblioset blockquote book bridgehead callout calloutlist caption caution \ +chapter chapterinfo classsynopsis cmdsynopsis colophon constraintdef \ +constructorsynopsis dedication destructorsynopsis entry epigraph equation example \ +figure formalpara funcsynopsis glossary glossdef glossdiv glossentry glosslist \ +glosssee glossseealso graphic graphicco highlights imageobjectco important \ +index indexdiv indexentry indexinfo info informalequation informalexample \ +informalfigure informaltable legalnotice literallayout lot lotentry mediaobject \ +mediaobjectco msgmain msgset note orderedlist para part preface primaryie \ +procedure qandadiv qandaentry qandaset refentry refentrytitle reference \ +refnamediv refsect1 refsect2 refsect3 refsection revhistory screenshot sect1 \ +sect2 sect3 sect4 sect5 section seglistitem set setindex sidebar simpara \ +simplesect step substeps synopfragment synopsis table term title \ +toc variablelist varlistentry warning itemizedlist listitem \ +footnote colspec partintro row simplelist subtitle tbody tgroup thead tip + format block + normalize no + + +#appendix bibliography chapter glossary preface reference +# element-break 3 + +sect1 section + element-break 2 + + +# +para abstract + format block + entry-break 1 + exit-break 1 + normalize yes + wrap-length 79 + +title + format block + normalize = yes + entry-break = 0 + exit-break = 0 + +# Inline elements +abbrev accel acronym action application citation citebiblioid citerefentry citetitle \ +classname co code command computeroutput constant country database date email emphasis \ +envar errorcode errorname errortext errortype exceptionname fax filename \ +firstname firstterm footnoteref foreignphrase funcdef funcparams function \ +glossterm group guibutton guiicon guilabel guimenu guimenuitem guisubmenu \ +hardware holder honorific indexterm inlineequation inlinegraphic inlinemediaobject \ +interface interfacename \ +keycap keycode keycombo keysym lineage link literal manvolnum markup medialabel \ +menuchoice methodname methodparam modifier mousebutton olink ooclass ooexception \ +oointerface option optional otheraddr othername package paramdef parameter personname \ +phrase pob postcode productname prompt property quote refpurpose replaceable \ +returnvalue revnumber sgmltag state street structfield structname subscript \ +superscript surname symbol systemitem token trademark type ulink userinput \ +uri varargs varname void wordasword xref year mathphrase member tag + format inline + +programlisting screen + format verbatim + entry-break = 0 + exit-break = 0 + + +#term +# format inline diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 22acddc8ca91..693d2fde9916 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.foundationdb; + pkg = cfg.package; # used for initial cluster configuration initialIpAddr = if (cfg.publicAddress != "auto") then cfg.publicAddress else "127.0.0.1"; @@ -24,7 +25,7 @@ let group = ${cfg.group} [fdbserver] - command = ${pkgs.foundationdb}/bin/fdbserver + command = ${pkg}/bin/fdbserver public_address = ${cfg.publicAddress}:$ID listen_address = ${cfg.listenAddress} datadir = ${cfg.dataDir}/$ID @@ -35,6 +36,13 @@ let memory = ${cfg.memory} storage_memory = ${cfg.storageMemory} + ${optionalString (cfg.tls != null) '' + tls_plugin = ${pkg}/libexec/plugins/FDBLibTLS.so + tls_certificate_file = ${cfg.tls.certificate} + tls_key_file = ${cfg.tls.key} + tls_verify_peers = ${cfg.tls.allowedPeers} + ''} + ${optionalString (cfg.locality.machineId != null) "locality_machineid=${cfg.locality.machineId}"} ${optionalString (cfg.locality.zoneId != null) "locality_zoneid=${cfg.locality.zoneId}"} ${optionalString (cfg.locality.datacenterId != null) "locality_dcid=${cfg.locality.datacenterId}"} @@ -43,7 +51,7 @@ let ${fdbServers cfg.serverProcesses} [backup_agent] - command = ${pkgs.foundationdb}/libexec/backup_agent + command = ${pkg}/libexec/backup_agent ${backupAgents cfg.backupProcesses} ''; in @@ -52,6 +60,14 @@ in enable = mkEnableOption "FoundationDB Server"; + package = mkOption { + type = types.package; + description = '' + The FoundationDB package to use for this server. This must be specified by the user + in order to ensure migrations and upgrades are controlled appropriately. + ''; + }; + publicAddress = mkOption { type = types.str; default = "auto"; @@ -188,6 +204,43 @@ in ''; }; + tls = mkOption { + default = null; + description = '' + FoundationDB Transport Security Layer (TLS) settings. + ''; + + type = types.nullOr (types.submodule ({ + options = { + certificate = mkOption { + type = types.str; + description = '' + Path to the TLS certificate file. This certificate will + be offered to, and may be verified by, clients. + ''; + }; + + key = mkOption { + type = types.str; + description = "Private key file for the certificate."; + }; + + allowedPeers = mkOption { + type = types.str; + default = "Check.Valid=1,Check.Unexpired=1"; + description = '' + "Peer verification string". This may be used to adjust which TLS + client certificates a server will accept, as a form of user + authorization; for example, it may only accept TLS clients who + offer a certificate abiding by some locality or organization name. + + For more information, please see the FoundationDB documentation. + ''; + }; + }; + })); + }; + locality = mkOption { default = { machineId = null; @@ -270,7 +323,7 @@ in meta.doc = ./foundationdb.xml; meta.maintainers = with lib.maintainers; [ thoughtpolice ]; - environment.systemPackages = [ pkgs.foundationdb ]; + environment.systemPackages = [ pkg ]; users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton { name = "foundationdb"; @@ -324,34 +377,37 @@ in ReadWritePaths = lib.concatStringsSep " " (map (x: "-" + x) rwpaths); }; - path = [ pkgs.foundationdb pkgs.coreutils ]; + path = [ pkg pkgs.coreutils ]; preStart = '' rm -f ${cfg.pidfile} && \ touch ${cfg.pidfile} && \ chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile} - for x in "${cfg.logDir}" "${cfg.dataDir}" /etc/foundationdb; do - [ ! -d "$x" ] && mkdir -m 0700 -vp "$x" && chown -R ${cfg.user}:${cfg.group} "$x"; + for x in "${cfg.logDir}" "${cfg.dataDir}"; do + [ ! -d "$x" ] && mkdir -m 0700 -vp "$x"; + chown -R ${cfg.user}:${cfg.group} "$x"; done + [ ! -d /etc/foundationdb ] && \ + mkdir -m 0775 -vp /etc/foundationdb && \ + chown -R ${cfg.user}:${cfg.group} "/etc/foundationdb" + if [ ! -f /etc/foundationdb/fdb.cluster ]; then cf=/etc/foundationdb/fdb.cluster desc=$(tr -dc A-Za-z0-9 /dev/null | head -c8) rand=$(tr -dc A-Za-z0-9 /dev/null | head -c8) echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf - chmod 0660 $cf && chown -R ${cfg.user}:${cfg.group} $cf + chmod 0664 $cf && chown -R ${cfg.user}:${cfg.group} $cf touch "${cfg.dataDir}/.first_startup" fi ''; - script = '' - exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile}; - ''; + script = "exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile}"; postStart = '' if [ -e "${cfg.dataDir}/.first_startup" ]; then - fdbcli --exec "configure new single ssd" + fdbcli --exec "configure new single memory" rm -f "${cfg.dataDir}/.first_startup"; fi ''; diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 2a0e3c76c9d8..def9cc436691 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -12,7 +12,7 @@ Maintainer: Austin Seipp -Default version: 5.1.x +Available version(s): 5.1.x FoundationDB (or "FDB") is a distributed, open source, high performance, transactional key-value store. It can store petabytes of data and deliver @@ -26,9 +26,17 @@ exceptional performance while maintaining consistency and ACID semantics services.foundationdb.enable = true; +services.foundationdb.package = pkgs.foundationdb51; # FoundationDB 5.1.x +The option is required, +and must always be specified. Because FoundationDB network protocols and +on-disk storage formats may change between (major) versions, and upgrades must +be explicitly handled by the user, you must always manually specify this +yourself so that the NixOS module will use the proper version. Note that minor, +bugfix releases are always compatible. + After running nixos-rebuild, you can verify whether FoundationDB is running by executing fdbcli (which is added to ): @@ -192,6 +200,44 @@ to a new node in order to connect, if it is not part of the cluster. +
Client authorization and TLS + +By default, any user who can connect to a FoundationDB process with the +correct cluster configuration can access anything. FoundationDB uses a +pluggable design to transport security, and out of the box it supports a +LibreSSL-based plugin for TLS support. This plugin not only does in-flight +encryption, but also performs client authorization based on the given +endpoint's certificate chain. For example, a FoundationDB server may be +configured to only accept client connections over TLS, where the client TLS +certificate is from organization Acme Co in the +Research and Development unit. + +Configuring TLS with FoundationDB is done using the + options in order to control the peer +verification string, as well as the certificate and its private key. + +Note that the certificate and its private key must be accessible to the +FoundationDB user account that the server runs under. These files are also NOT +managed by NixOS, as putting them into the store may reveal private +information. + +After you have a key and certificate file in place, it is not enough to +simply set the NixOS module options -- you must also configure the +fdb.cluster file to specify that a given set of coordinators +use TLS. This is as simple as adding the suffix :tls to your +cluster coordinator configuration, after the port number. For example, assuming +you have a coordinator on localhost with the default configuration, simply +specifying: + + +XXXXXX:XXXXXX@127.0.0.1:4500:tls + + +will configure all clients and server processes to use TLS from now +on. + +
+
Backups and Disaster Recovery The usual rules for doing FoundationDB backups apply on NixOS as written @@ -245,16 +291,12 @@ FoundationDB is not new software, but the NixOS compilation and integration has only undergone fairly basic testing of all the available functionality. - TLS plugin support is compiled in, but it's currently not - possible to specify the set of TLS certificate options in - services.foundationdb There is no way to specify individual parameters for individual fdbserver processes. Currently, all server processes inherit all the global fdbmonitor settings. Python bindings are not currently installed. Ruby bindings are not currently installed. - Java bindings are not currently installed. Go bindings are not currently installed. diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 96ac2a1cf2c9..45931cb42b54 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -5,6 +5,45 @@ with lib; let cfg = config.services.dockerRegistry; + blobCache = if cfg.enableRedisCache + then "redis" + else "inmemory"; + + registryConfig = { + version = "0.1"; + log.fields.service = "registry"; + storage = { + cache.blobdescriptor = blobCache; + filesystem.rootdirectory = cfg.storagePath; + delete.enabled = cfg.enableDelete; + }; + http = { + addr = ":${builtins.toString cfg.port}"; + headers.X-Content-Type-Options = ["nosniff"]; + }; + health.storagedriver = { + enabled = true; + interval = "10s"; + threshold = 3; + }; + }; + + registryConfig.redis = mkIf cfg.enableRedisCache { + addr = "${cfg.redisUrl}"; + password = "${cfg.redisPassword}"; + db = 0; + dialtimeout = "10ms"; + readtimeout = "10ms"; + writetimeout = "10ms"; + pool = { + maxidle = 16; + maxactive = 64; + idletimeout = "300s"; + }; + }; + + configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig)); + in { options.services.dockerRegistry = { enable = mkEnableOption "Docker Registry"; @@ -27,6 +66,26 @@ in { description = "Docker registry storage path."; }; + enableDelete = mkOption { + type = types.bool; + default = false; + description = "Enable delete for manifests and blobs."; + }; + + enableRedisCache = mkEnableOption "redis as blob cache"; + + redisUrl = mkOption { + type = types.str; + default = "localhost:6379"; + description = "Set redis host and port."; + }; + + redisPassword = mkOption { + type = types.str; + default = ""; + description = "Set redis password."; + }; + extraConfig = mkOption { description = '' Docker extra registry configuration via environment variables. @@ -34,6 +93,19 @@ in { default = {}; type = types.attrsOf types.str; }; + + enableGarbageCollect = mkEnableOption "garbage collect"; + + garbageCollectDates = mkOption { + default = "daily"; + type = types.str; + description = '' + Specification (in the format described by + systemd.time + 7) of the time at + which the garbage collect will occur. + ''; + }; }; config = mkIf cfg.enable { @@ -41,15 +113,8 @@ in { description = "Docker Container Registry"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - - environment = { - REGISTRY_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.port}"; - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY = cfg.storagePath; - } // cfg.extraConfig; - script = '' - ${pkgs.docker-distribution}/bin/registry serve \ - ${pkgs.docker-distribution.out}/share/go/src/github.com/docker/distribution/cmd/registry/config-example.yml + ${pkgs.docker-distribution}/bin/registry serve ${configFile} ''; serviceConfig = { @@ -58,6 +123,22 @@ in { }; }; + systemd.services.docker-registry-garbage-collect = { + description = "Run Garbage Collection for docker registry"; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig.Type = "oneshot"; + + script = '' + ${pkgs.docker-distribution}/bin/registry garbage-collect ${configFile} + ${pkgs.systemd}/bin/systemctl restart docker-registry.service + ''; + + startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; + }; + users.extraUsers.docker-registry = { createHome = true; home = cfg.storagePath; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 180b273d177e..780448d8bad8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -18,18 +18,19 @@ let # systemd service must be provided by specifying either # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` exporterOpts = { - blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; - collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; - dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; - fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; - json = import ./exporters/json.nix { inherit config lib pkgs; }; - minio = import ./exporters/minio.nix { inherit config lib pkgs; }; - nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; - node = import ./exporters/node.nix { inherit config lib pkgs; }; - postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; - snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; - unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; - varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; + blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; + collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; + dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; + fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; + json = import ./exporters/json.nix { inherit config lib pkgs; }; + minio = import ./exporters/minio.nix { inherit config lib pkgs; }; + nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; + node = import ./exporters/node.nix { inherit config lib pkgs; }; + postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; + snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; + surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; }; + unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; + varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; }; mkExporterOpts = ({ name, port }: { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 39054c2b73dd..431dd8b4ead7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -39,7 +39,7 @@ in --nginx.scrape_uri '${cfg.scrapeUri}' \ --telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ --telemetry.endpoint ${cfg.telemetryEndpoint} \ - --insecure ${cfg.insecure} \ + --insecure ${toString cfg.insecure} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix new file mode 100644 index 000000000000..715dba06a3dc --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.surfboard; +in +{ + port = 9239; + extraOpts = { + modemAddress = mkOption { + type = types.str; + default = "192.168.100.1"; + description = '' + The hostname or IP of the cable modem. + ''; + }; + }; + serviceOpts = { + description = "Prometheus exporter for surfboard cable modem"; + unitConfig.Documentation = "https://github.com/ipstatic/surfboard_exporter"; + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-surfboard-exporter}/bin/surfboard_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --modem-address ${cfg.modemAddress} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 0b6bec786da4..374a84332357 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -221,7 +221,7 @@ in echo "Obtaining SSH keys..." mkdir -m 0700 -p /root/.ssh AUTH_KEYS=$(${mktemp}) - ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys + ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys if [ -s $AUTH_KEYS ]; then # Read in key one by one, split in case Google decided @@ -246,6 +246,18 @@ in false fi rm -f $AUTH_KEYS + SSH_HOST_KEYS_DIR=$(${mktemp} -d) + ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key + ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key_pub + if [ -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key -a -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub ]; then + mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/ + chmod 600 /etc/ssh/ssh_host_ed25519_key + chmod 644 /etc/ssh/ssh_host_ed25519_key.pub + else + echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed." + false + fi + rm -f $SSH_HOST_KEYS_DIR ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 7413e12c8f3d..885d752577d5 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -6,7 +6,7 @@ let cfg = config.virtualisation.virtualbox.host; virtualbox = pkgs.virtualbox.override { - inherit (cfg) enableHardening headless; + inherit (cfg) enableExtensionPack enableHardening headless; }; kernelModules = config.boot.kernelPackages.virtualbox.override { @@ -17,9 +17,7 @@ in { options.virtualisation.virtualbox.host = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption "VirtualBox" // { description = '' Whether to enable VirtualBox. @@ -30,6 +28,8 @@ in ''; }; + enableExtensionPack = mkEnableOption "VirtualBox extension pack"; + addNetworkInterface = mkOption { type = types.bool; default = true; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 109fca440e57..1fbd199c7bc4 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -3,14 +3,16 @@ import ./make-test.nix ({ pkgs, ...} : { name = "docker-registry"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ globin ]; + maintainers = [ globin ma27 ironpinguin ]; }; nodes = { registry = { config, pkgs, ... }: { services.dockerRegistry.enable = true; + services.dockerRegistry.enableDelete = true; services.dockerRegistry.port = 8080; services.dockerRegistry.listenAddress = "0.0.0.0"; + services.dockerRegistry.enableGarbageCollect = true; networking.firewall.allowedTCPPorts = [ 8080 ]; }; @@ -33,11 +35,29 @@ import ./make-test.nix ({ pkgs, ...} : { $registry->start(); $registry->waitForUnit("docker-registry.service"); + $registry->waitForOpenPort("8080"); $client1->succeed("docker push registry:8080/scratch"); $client2->start(); $client2->waitForUnit("docker.service"); $client2->succeed("docker pull registry:8080/scratch"); $client2->succeed("docker images | grep scratch"); + + $client2->succeed( + 'curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H"Accept: application/vnd.docker.distribution.manifest.v2+json" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e \'s/Docker-Content-Digest: //\' | tr -d \'\r\')' + ); + + $registry->systemctl("start docker-registry-garbage-collect.service"); + $registry->waitUntilFails("systemctl status docker-registry-garbage-collect.service"); + $registry->waitForUnit("docker-registry.service"); + + $registry->fail( + 'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data' + ); + + $client1->succeed("docker push registry:8080/scratch"); + $registry->succeed( + 'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data' + ); ''; }) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 4c9540607eb6..31369bd1e638 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl -, pkgconfig, cmake -, docbook_xml_dtd_45, docbook_xsl, libxslt -, python, ffmpeg, mp4v2, flac, libogg, libvorbis -, phonon, automoc4, chromaprint, id3lib, taglib -, qt, zlib, readline +, pkgconfig, cmake, python, ffmpeg, phonon, automoc4 +, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt +, id3lib, taglib, mp4v2, flac, libogg, libvorbis +, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols , makeWrapper }: @@ -18,9 +17,10 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt - phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis - qt zlib readline makeWrapper ]; + [ pkgconfig cmake python ffmpeg phonon automoc4 + chromaprint docbook_xml_dtd_45 docbook_xsl libxslt + id3lib taglib mp4v2 flac libogg libvorbis zlib readline + qtbase qttools qtmultimedia qtquickcontrols makeWrapper ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins + wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt5/plugins ''; enableParallelBuilding = true; @@ -73,4 +73,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -# TODO: Qt5 support - not so urgent! diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 324818736694..1a4f2bdd1b5b 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,8 +2,6 @@ , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: -assert stdenv.system == "x86_64-linux"; - let # Please update the stable branch! # Latest version number can be found at: diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index aedfb1fec3de..98172ce1905b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -3,8 +3,6 @@ , androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses }: -assert stdenv.isLinux; - with stdenv.lib; let @@ -239,12 +237,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */ + sha256 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -252,25 +250,25 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.3.7"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */ + sha256 = "12rihb1ppl4i1i0j3yj4ih4qx3xf30kfx022pbvng1rjy0bpikp7"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_3"; + update-channel = "datagrip_2018_1"; }; goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */ + sha256 = "1qhhxarvw6mzavyzackzkbq52yfr5437gljxdvlbr6rpi99hgfzb"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -304,25 +302,25 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.6"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */ + sha256 = "13si8g7n1qvjm5ivbrazsbqlvwwlg65nia78k74nkaqp704z92cs"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PS2017.3"; + update-channel = "PS2018.1"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */ + sha256 = "1phxzsz2qnyk0b0kkccsgjkxx4ak7rbm68k1lpgr59rwyxqnazy3"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -330,12 +328,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */ + sha256 = "08cfmrrmxs67dc61cvjc0ynzng0hnr2i78fv3m888k4x63cy6mv5"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -356,15 +354,15 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */ + sha256 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "rm2017.3"; + update-channel = "rm2018.1"; }; webstorm = buildWebStorm rec { diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 9cf5bd97d0a3..78c2d9aaa0c4 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -2,11 +2,10 @@ let libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "sublimetext-2.0.2"; - src = + src = if stdenv.system == "i686-linux" then fetchurl { name = "sublimetext-2.0.2.tar.bz2"; @@ -55,5 +54,6 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 7185a82a9601..628993dbf5be 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -4,7 +4,6 @@ pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash}: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let @@ -114,6 +113,6 @@ in stdenv.mkDerivation (rec { homepage = https://www.sublimetext.com/; maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; }) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 410c74ac6cfa..65a3238ef571 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-27"; - sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k"; + version = "7.0.7-29"; + sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6"; patches = []; }; in diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 9ab43ff94337..b604099096ff 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -4,8 +4,6 @@ libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: -assert stdenv.system == "x86_64-linux"; - let version = "2017-SP2"; in stdenv.mkDerivation { name = "draftsight-${version}"; @@ -71,6 +69,6 @@ stdenv.mkDerivation { homepage = https://www.3ds.com/products-services/draftsight-cad-software/; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ hodapp ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix new file mode 100644 index 000000000000..2ac335759ce4 --- /dev/null +++ b/pkgs/applications/misc/cointop/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "cointop-unstable-${version}"; + version = "2018-05-03"; + rev = "08acd96082682347d458cd4f861e2debd3255745"; + + goPackagePath = "github.com/miguelmota/cointop"; + + src = fetchgit { + inherit rev; + url = "https://github.com/miguelmota/cointop"; + sha256 = "14savz48wzrfpm12fgnnndpl3mpzx7wsch4jrnm3rmrfdabdx7mi"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; + longDescription = '' + cointop is a fast and lightweight interactive terminal based UI application + for tracking and monitoring cryptocurrency coin stats in real-time. + + The interface is inspired by htop and shortcut keys are inspired by vim. + ''; + homepage = https://cointop.sh; + platforms = stdenv.lib.platforms.linux; # cannot test others + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/misc/cointop/deps.nix b/pkgs/applications/misc/cointop/deps.nix new file mode 100644 index 000000000000..3ba1d12a8048 --- /dev/null +++ b/pkgs/applications/misc/cointop/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ +] diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 7852e6eb790e..45c448804626 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "3.1.2.1"; + version = "3.1.3.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; + sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index ebc13766cccb..638765840cb9 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "IPMIView-${version}"; version = "2.13.0"; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index f231df3d8e76..a0b1916fb181 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -13,17 +13,17 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.6) ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.1) + html-pipeline (2.7.2) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.0) + jekyll (3.8.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -38,8 +38,7 @@ GEM safe_yaml (~> 1.0) jekyll-avatar (0.6.0) jekyll (~> 3.0) - jekyll-mentions (1.3.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-sass-converter (1.5.2) @@ -50,8 +49,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 7c6ac55c2012..c93f93f457db 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -45,10 +45,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; ffi = { source = { @@ -78,10 +78,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; "http_parser.rb" = { source = { @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; + sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6"; type = "gem"; }; - version = "3.8.0"; + version = "3.8.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -119,13 +119,13 @@ version = "0.6.0"; }; jekyll-mentions = { - dependencies = ["activesupport" "html-pipeline" "jekyll"]; + dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; + sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -164,13 +164,13 @@ version = "2.0.0"; }; jemoji = { - dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; kramdown = { source = { diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 45bd34187ca9..bbcdad669da1 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -20,7 +20,7 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.6) execjs (2.7.0) faraday (0.15.0) multipart-post (>= 1.2, < 3) @@ -28,13 +28,13 @@ GEM ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.1) + html-pipeline (2.7.2) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.0) + jekyll (3.8.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -56,8 +56,7 @@ GEM jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.3.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -71,8 +70,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index b45ea5b9d079..8473cee0be53 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -79,10 +79,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; execjs = { source = { @@ -137,10 +137,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; "http_parser.rb" = { source = { @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; + sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6"; type = "gem"; }; - version = "3.8.0"; + version = "3.8.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -205,13 +205,13 @@ version = "1.5.0"; }; jekyll-mentions = { - dependencies = ["activesupport" "html-pipeline" "jekyll"]; + dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; + sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; jekyll-paginate = { source = { @@ -267,13 +267,13 @@ version = "2.0.0"; }; jemoji = { - dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; kramdown = { source = { diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 8a752bbaf86e..a9ec2760e8ad 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.0"; name = "makeself-${version}"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; rev = "release-${version}"; - sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p"; + sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; }; patchPhase = '' diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index acf0731f0aeb..d11e889e932c 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -1,12 +1,10 @@ { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { version = "8.1"; name = "minergate-${version}"; src = fetchurl { - url = "https://minergate.com/download/ubuntu"; + url = "https://minergate.com/download/ubuntu"; sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; }; @@ -15,12 +13,12 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - dpkg-deb -x $src $out + dpkg-deb -x $src $out pgm=$out/opt/minergate/minergate interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" rm $out/usr/bin/minergate @@ -35,5 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bfortz ]; platforms = [ "x86_64-linux" ]; }; -} - +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 000a916b737a..fbc7da070211 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -14,77 +14,19 @@ let in stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.13.0"; name = "mupdf-${version}"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; + sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707"; }; patches = [ - # Compatibility with new openjpeg - (fetchpatch { - name = "mupdf-1.12-openjpeg-version.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; - sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; - }) - (fetchpatch { - name = "CVE-2018-6544.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; - sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; - }) - (fetchpatch { - name = "CVE-2018-6544.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; - sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; - }) - (fetchpatch { - # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit. - name = "CVE-2017-17858.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731"; - sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv"; - }) - (fetchpatch { - # Bug 698825: Do not drop borrowed colorspaces. - name = "CVE-2018-1000051.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384"; - sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm"; - }) - (fetchpatch { - # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family. - name = "CVE-2018-6187.0.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807"; - sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728"; - }) - (fetchpatch { - # Bug 698908 precondition: Fix "being able to search for redacted text" bug. - name = "CVE-2018-6187.0.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6"; - sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s"; - }) - (fetchpatch { - # Bug 698908: Resize object use and renumbering lists after repair. - name = "CVE-2018-6187.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec"; - sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j"; - }) - (fetchpatch { - # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter. - name = "CVE-2018-6187.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2"; - sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc"; - }) - (fetchpatch { - # Bug 698916: Indirect object numbers must be in range. - name = "CVE-2018-6192.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299"; - sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj"; - }) ] # Use shared libraries to decrease size - ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch similarity index 80% rename from pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch rename to pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch index b39f005ed74a..e29f1f52077c 100644 --- a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch +++ b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch @@ -9,22 +9,24 @@ LIBS += $(XLIBS) -lm LIBS += $(FREETYPE_LIBS) -@@ -312,9 +312,9 @@ +@@ -312,10 +312,10 @@ # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdfthird.a -THREAD_LIB = $(OUT)/libmuthreads.a +-PKCS7_LIB = $(OUT)/libmupkcs7.a +MUPDF_LIB = $(OUT)/libmupdf.so +THIRD_LIB = $(OUT)/libmupdfthird.so +THREAD_LIB = $(OUT)/libmuthreads.so ++PKCS7_LIB = $(OUT)/libmupkcs7.so MUPDF_OBJ := \ $(FITZ_OBJ) \ -@@ -343,11 +343,14 @@ - - THREAD_OBJ := $(THREAD_OBJ) +@@ -343,13 +343,17 @@ + $(ZLIB_OBJ) \ + $(LCMS2_OBJ) -$(MUPDF_LIB) : $(MUPDF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) @@ -33,9 +35,11 @@ + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined $(THREAD_LIB) : $(THREAD_OBJ) + $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread + $(PKCS7_LIB) : $(PKCS7_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) -+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) ++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) # --- Tools and Apps --- diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix deleted file mode 100644 index 0f40a236c587..000000000000 --- a/pkgs/applications/misc/open-pdf-presenter/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }: - -stdenv.mkDerivation rec { - name = "open-pdf-presenter-git-2014-09-23"; - - src = fetchFromGitHub { - owner = "olabini"; - repo = "open-pdf-presenter"; - rev = "f14930871b60b6ba50298c27377605e0a5fdf124"; - sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr"; - }; - - buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ]; - - meta = { - homepage = https://github.com/olabini/open-pdf-presenter; - description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 9fb15aab2d45..2ad6321d5191 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -21,8 +21,6 @@ , curl }: -assert stdenv.isLinux; - let version = "4.2.12"; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index b8fa38268c38..09558ff4c47f 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,26 +1,47 @@ -{ stdenv, fetchurl, python27Packages, wmctrl }: +{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }: -python27Packages.buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.0"; +{ + stable = with python27Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.1"; - meta = with stdenv.lib; { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; + }; + + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + ]; }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + dev = with python36Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "4.0.0.dev6"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp"; + }; + + # I'm not sure why we don't find PyQt5 here but there's a similar + # sed on many of the platforms Plover builds for + postPatch = "sed -i /PyQt5/d setup.cfg"; + + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ]; }; - - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; - - buildInputs = with python27Packages; [ pytest mock ]; - propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi - wxPython xlib wmctrl ]; } diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 8928ee18064d..be365cb94e4e 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, +{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { dbus fontconfig freetype + libGL ]; installPhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6403f5441f36..923084a57385 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -154,11 +154,6 @@ let (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") - (fetchpatch { - ## see https://groups.google.com/a/chromium.org/forum/#!msg/chromium-packagers/So-ojMYOQdI/K66hndtdCAAJ - url = "https://bazaar.launchpad.net/~chromium-team/chromium-browser/bionic-stable/download/head:/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1/add-missing-blink-tools.patch"; - sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; - }) ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d55cc12c165a..7be5d2591150 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; - sha256bin64 = "067gpmiwnpdaqarkz740plg0ixpp7642xf4qqkq32w9v8flx3y57"; - version = "66.0.3359.117"; + sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n"; + sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n"; + version = "67.0.3396.18"; }; dev = { - sha256 = "0058g5dm5nfm7wdpd9y4fn0dmi8bq013l0ky5fsn4j7msm55rrg5"; - sha256bin64 = "1ag8kg3jjv6jsxdjq33h4ksqhhhfaz5aqw9jaaqhfma908c5mc9y"; - version = "67.0.3396.10"; + sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f"; + sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j"; + version = "68.0.3409.2"; }; stable = { - sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; - sha256bin64 = "1ycfq6pqk7a9kyqf2112agcxav360rxbqqdc1yil0qkmz51i9zdg"; - version = "66.0.3359.117"; + sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy"; + sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0"; + version = "66.0.3359.139"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5b01daeef510..97ce7d06c411 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -48,8 +48,6 @@ , gnupg }: -assert stdenv.isLinux; - let inherit (generated) version sources; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d56ceff81842..7ab61ec2fe5c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,7 +7,7 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin -, browserpass, chrome-gnome-shell +, browserpass, chrome-gnome-shell, uget-integrator , libudev , kerberos }: @@ -62,6 +62,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index db871c0c9a5b..fb6e85ccdbba 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, dpkg, zlib }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - stdenv.mkDerivation { name = "TREZOR-bridge-1.0.5"; @@ -42,6 +40,7 @@ stdenv.mkDerivation { # Download URL, .deb content & hash (yikes) changed, not version. # New archive doesn't contain any Mozilla plugin at all. broken = true; - }; + platforms = platforms.linux; + }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index 9764e029d277..304df0947acf 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "terraform-provider-ibm-${version}"; - version = "0.8.0"; + version = "0.9.1"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; subPackages = [ "./" ]; @@ -20,7 +20,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "IBM-Cloud"; repo = "terraform-provider-ibm"; - sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4"; + sha256 = "1j8v7r5lsvrg1afdbwxi8vq665qr47a9pddqgmpkirh99pzixgr6"; rev = "v${version}"; }; diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 16eb6004e3ee..24695066fa28 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -58,7 +58,7 @@ cd "$(dirname "$0")" if [[ -z "${GITHUB_AUTH:-}" ]]; then cat <<'HELP' -Missing the GITHUB_AUTH env. Thi is required to work around the 60 request +Missing the GITHUB_AUTH env. This is required to work around the 60 request per hour rate-limit. Go to https://github.com/settings/tokens and create a new token with the diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index a5c21e28c3d6..7953f35507d1 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: -assert stdenv.isLinux; - # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 76d688802636..6801edb9767c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.4"; + version = "0.0.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb"; + sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3fd8b932283e..a1c81f3f0020 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -17,11 +17,11 @@ with lib; buildPythonApplication rec { name = "gajim-${version}"; majorVersion = "1.0"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"; + sha256 = "0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 1d03c2f47c89..681a8119ac03 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -3,8 +3,6 @@ , alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "jitsi-${version}"; version = "2.10.5550"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d524be287cd2..479b89bcecbd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.7.1"; + version = "1.9.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "02zx8ynbvvs260mrvqbsg0fi561da4ni3i9f4bjh53vqn92vhvvq"; + sha256 = "18i9chyarpcw369rqyldckkln1lxy5g9qy9f5gy5gsz9y5qngxqa"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; @@ -81,7 +81,7 @@ in description = "Signal Private Messenger for the Desktop."; homepage = https://signal.org/; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.ixmatus ]; + maintainers = with lib.maintainers; [ ixmatus primeos ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 0bcf3493d29e..9df816dd8907 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -33,12 +33,12 @@ let ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation rec { - version = "1.8.18"; + version = "1.17.82"; name = "stride-${version}"; src = fetchurl { url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; - sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym"; + sha256 = "0lx61gdhw0kv4f9fwbfg69yq52dsp4db7c4li25d6wn11qanzqhy"; }; dontBuild = true; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 3c164820019b..781912f665d5 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -3,8 +3,6 @@ libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "viber-${version}"; version = "7.0.0.1035"; @@ -99,7 +97,7 @@ stdenv.mkDerivation rec { homepage = http://www.viber.com; description = "An instant messaging and Voice over IP (VoIP) app"; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ jagajaga ]; }; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index cf3725c35e3d..e718dc6562fb 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.3.22.36179"; + version = "1.4.5.37069"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140"; + sha256 = "0mkqgpq4isngkj20c0ygmxf4cj975d446svhwvl3cqdrjkjm1ybd"; } else throw "${name} is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 7c685b9df6b9..739842bbec3a 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -24,8 +24,6 @@ let buildCore = monolithic || daemon; in -assert stdenv.isLinux; - assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9dbc99cac7d0..759cf74ba9d0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -43,8 +43,6 @@ , gnupg }: -assert stdenv.isLinux; - # imports `version` and `sources` with (import ./release_sources.nix); diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index cf825b724962..d8fc1d840d2b 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -10,11 +10,11 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; - version = "2.93"; + version = "2.94"; src = fetchurl { - url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz"; - sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"; + url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"; + sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"; }; nativeBuildInputs = [ pkgconfig ] diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 531a1d5d0a17..e1a2cf8d1716 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.46"; + version = "0.14.47"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm"; + sha256 = "1md835c13f3c9bknnm6pxn0r8k8g2wg56zfav96bpnpk4aqx41bh"; }; inherit patches; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index f8742253c519..436558283e05 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "6"; minor = "0"; - patch = "2"; - tweak = "1"; + patch = "3"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd"; + sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 89af45814bff..c8897c87bd3c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl"; + sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a"; + sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686"; }; }; @@ -184,7 +184,7 @@ in stdenv.mkDerivation rec { done cp -r sysui/desktop/icons "$out/share" - sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; configureFlags = [ diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 28c06b65869f..251aa44a2c58 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -532,11 +532,11 @@ md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz"; - sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"; + name = "libxml2-2.9.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; + sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; md5 = ""; - md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz"; + md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz"; } { name = "libxslt-1.1.32.tar.gz"; @@ -651,11 +651,11 @@ md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; } { - name = "liborcus-0.13.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz"; - sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937"; + name = "liborcus-0.13.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"; + sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9"; md5 = ""; - md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz"; + md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b4139d54af50..52baed720c5f 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -183,7 +183,7 @@ in stdenv.mkDerivation rec { done cp -r sysui/desktop/icons "$out/share" - sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; configureFlags = [ diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index 52cd91e8030e..cff8f200e2bc 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -1,13 +1,13 @@ #!@bash@/bin/bash export JAVA_HOME="${JAVA_HOME:-@jdk@}" -export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" +#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" if uname | grep Linux > /dev/null && ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" mkdir "$dbus_tmp_dir" dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null & export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" fi diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index a0a825201524..15a57ba9de4b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -34,8 +34,6 @@ , writeScript }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let arch32 = "i686-linux"; arch64 = "x86_64-linux"; @@ -140,7 +138,7 @@ stdenv.mkDerivation { homepage = http://www.mendeley.com; description = "A reference manager and academic social network"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index bfadf9e704a7..fe25a04c420a 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.9g"; + version = "4.9h"; name = "paml-${version}"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h"; + sha256 = "1czdfb3naadq0d3y42isrbyja33c3p28k8dv9mxlx2h19b7zcfv2"; }; preBuild = '' diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 8229af9649f8..22eb5d07f1c1 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: -assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 73659a32f4bf..2bd8697c8ec1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,7 +82,7 @@ rec { git-radar = callPackage ./git-radar { }; git-recent = callPackage ./git-recent { - utillinux = if stdenv.isLinux then utillinuxMinimal else null; + utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux; }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 0272d4414607..82bcbf74a9eb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -1,15 +1,9 @@ {stdenv, git, less, fetchFromGitHub, makeWrapper # utillinuxMinimal is included because we need the column command -, utillinux ? null +, utillinux }: -assert stdenv.isLinux -> utillinux != null; - -let - binpath = stdenv.lib.makeBinPath - ([ git less ] - ++ stdenv.lib.optional (utillinux != null) utillinux); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "git-recent-${version}"; version = "1.0.4"; @@ -28,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${binpath}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index bb519ef3dab0..b03ca2328b39 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -39,13 +39,13 @@ ]); in stdenv.mkDerivation rec { name = "webtorrent-desktop-${version}"; - version = "0.19.0"; + version = "0.20.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb"; - sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd"; + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb"; + sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k"; } else throw "Webtorrent is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 40eadad68d09..6743c8491891 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz"; + sha256 = "0dajc9fg57gj915h5dxavbia4wx10frn4xc61pv0l8r5zp7xvqal"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 29cb7c192b56..ca0520f32a8f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26"; - extpackRev = "121009"; - main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"; - version = "5.2.8"; + extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b"; + extpackRev = "122406"; + main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd"; + version = "5.2.10"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 96e8404b3ef9..b15eed09fde1 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0"; + sha256 = "78a4f18eb0968c7d14dbfe9decf96759c3f85d28f7e3e7ae339266f4a0b22bd1"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index c3280cbda94b..dab90a1ed781 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -29,6 +29,12 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib glib python2 @@ -53,6 +59,9 @@ callPackage (import ./generic.nix (rec { rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; }; + patches = [ + qemuMemfdBuildFix + ]; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 75e279afdc37..584beb3d89b8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,7 +32,28 @@ rec { inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; - pullImage = callPackage ./pull.nix {}; + pullImage = + let + fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; + in { + imageName, + # To find the digest of an image, you can use skopeo: + # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' + # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b + imageDigest, + sha256, + # This used to set a tag to the pulled image + finalImageTag ? "latest", + name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }: + runCommand name { + impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; + outputHashMode="flat"; + outputHashAlgo="sha256"; + outputHash=sha256; + } + '' + ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag} + ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. @@ -560,7 +581,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 315440349b6b..eb5b9fe36e41 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -85,9 +85,9 @@ rec { # 4. example of pulling an image. could be used as a base for other images nixFromDockerHub = pullImage { imageName = "nixos/nix"; - imageTag = "1.11"; - # this hash will need change if the tag is updated at docker hub - sha256 = "0nncn9pn5miygan51w34c2p9qssi96jgsaqv44dxxdprc8pg0g83"; + imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; + finalImageTag = "1.11"; }; # 5. example of multiple contents, emacs and vi happily coexisting diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix deleted file mode 100644 index 5611c7785862..000000000000 --- a/pkgs/build-support/docker/pull.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }: -let - nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; -in -# For simplicity we only support sha256. -{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" -, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: -let - pullImage = vmTools.runInLinuxVM ( - stdenv.mkDerivation { - inherit name imageId; - - certs = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - builder = ./pull.sh; - - nativeBuildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; - - outputHashAlgo = "sha256"; - outputHash = sha256; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - - preVM = vmTools.createEmptyImage { - size = 2048; - fullName = "${name}-disk"; - }; - - QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0"; - }); -in - pullImage diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh deleted file mode 100644 index 0b1e9f310ee9..000000000000 --- a/pkgs/build-support/docker/pull.sh +++ /dev/null @@ -1,36 +0,0 @@ -source $stdenv/setup - -mkdir -p /var/lib/docker -mkfs.ext4 /dev/vda -mount -t ext4 /dev/vda /var/lib/docker - -modprobe virtio_net -dhclient eth0 - -mkdir -p /etc/ssl/certs/ -cp "$certs" "/etc/ssl/certs/" - -# from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount -mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup -cd /sys/fs/cgroup -for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi -done - -# run docker daemon -dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & - -until docker ps 2>/dev/null; do - printf '.' - sleep 1 -done - -rm -r $out - -docker pull ${imageId} -docker save ${imageId} > $out diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index e6b7a3418c0c..14dac9997d94 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,6 +1,7 @@ { stdenvNoCC, runCommand, awscli }: { s3url +, name ? builtins.baseNameOf s3url , sha256 , region ? "us-east-1" , credentials ? null # Default to looking at local EC2 metadata service @@ -10,16 +11,23 @@ }: let - credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) { - AWS_ACCESS_KEY_ID = credentials.access_key_id; - AWS_SECRET_ACCESS_KEY = credentials.secret_access_key; - AWS_SESSION_TOKEN = credentials.session_token ? null; + mkCredentials = { access_key_id, secret_access_key, session_token ? null }: { + AWS_ACCESS_KEY_ID = access_key_id; + AWS_SECRET_ACCESS_KEY = secret_access_key; + AWS_SESSION_TOKEN = session_token; }; -in runCommand "foo" ({ + + credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials); +in runCommand name ({ nativeBuildInputs = [ awscli ]; + outputHashAlgo = "sha256"; outputHash = sha256; outputHashMode = if recursiveHash then "recursive" else "flat"; + + preferLocalBuild = true; + + AWS_DEFAULT_REGION = region; } // credentialAttrs) (if postFetch != null then '' downloadedFile="$(mktemp)" aws s3 cp ${s3url} $downloadedFile diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index ec58dfd77492..d050a15cb794 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.15"; + version = "4.16"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f"; + sha256 = "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index ad2485dc4b8c..657eb80c5392 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -26,13 +26,13 @@ in let pname = if set != null then "iosevka-${set}" else "iosevka"; in let - version = "1.14.1"; + version = "1.14.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; rev = "v${version}"; - sha256 = "0m6kj1zfv9w6lyykhsfqdx2a951k8qa76licqikz5spm13n22z43"; + sha256 = "18vh5rjffqgiliyfia40lh7cygz6fv3rwgq28fxl26i9sc95qsqd"; }; in diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 38f8030cc272..e758c56f0235 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9cd032898a8fd11b69827ff02d2f295cac0907d9.tar.gz"; - sha256 = "1xxg3dcp5jgin978sa9510ji10p2j47x7b2n0xz00wrs9yjn5zvg"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/462dbb7e8a2ca65807ae21d1cc5f5c5454a9a327.tar.gz"; + sha256 = "09rq2r9ydvmhk9182xl0yz4dbr84ncj8a7fc2qzln784zrd12aph"; } diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 4b1daa3af90b..ab68acda2770 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "libgweather-2.30.3"; src = fetchurl { diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix deleted file mode 100644 index 8f398458fd53..000000000000 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ /dev/null @@ -1,206 +0,0 @@ -{ stdenv, targetPackages -, buildPlatform, hostPlatform, targetPlatform - -# build-tools -, bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 -, runCommand - -, libffi, libiconv ? null, ncurses - -, useLLVM ? !targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null, m4 - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? targetPlatform != hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? true - -, version ? "8.4.1" -, # Whether to backport https://phabricator.haskell.org/D4388 for - # deterministic profiling symbol names, at the cost of a slightly - # non-standard GHC API - deterministicProfiling ? false -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - '' + stdenv.lib.optionalString enableIntegerSimple '' - INTEGER_LIBRARY = integer-simple - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - BuildFlavour = perf-cross - Stage1Only = YES - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - ''; - - # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; - - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation rec { - inherit version; - inherit (src) rev; - name = "${targetPrefix}ghc-${version}"; - - src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb"; - sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) - ] ++ stdenv.lib.optional deterministicProfiling - (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism - url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; - sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; - }); - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - echo ${version} >VERSION - echo ${src.rev} >GIT_COMMIT_ID - ./boot - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; - - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; - - nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = libDeps hostPlatform; - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't - # treat that as a unary `{x,y,z,..}` repetition. - postInstall = '' - paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.1"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index 642c17dc6d3f..b93a13abc9ca 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -25,7 +25,6 @@ , setJavaClassPath }: -assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 29a192fcff24..261a2fb6432c 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0y46zgg3lamaqqhxbqmbwzvdakzvc9j07d0ci8f57pfl549v04a4"; + sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm"; }; patchPhase = '' diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 4c79fb15c5cb..d94ce75e3f55 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchzip, fetchurl, boost, cmake, z3 }: +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.4.20"; + version = "0.4.23"; + rev = "124ca40dc525a987a88176c6e5170978e82fa290"; + sha256 = "07l8rfqh95yrdmbxc4pfb77s06k5v65dk3rgdqscqmwchkndrmm0"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -12,33 +14,45 @@ in stdenv.mkDerivation { name = "solc-${version}"; - # Cannot use `fetchFromGitHub' because of submodules - src = fetchurl { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "0jyqnykj537ksfsf2m6ww9vganmpa6yd5fmlfpa5qm1076kq7zd6"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "solidity"; + inherit rev sha256; }; - patchPhase = '' + patches = [ + ./patches/boost-shared-libs.patch + ./patches/shared-libs-install.patch + ]; + + postPatch = '' + touch prerelease.txt + echo >commit_hash.txt "${rev}" substituteInPlace cmake/jsoncpp.cmake \ - --replace '${jsoncppURL}' ${jsoncpp} + --replace "${jsoncppURL}" ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ - --replace 'add_compile_options(-Werror)' "" + --replace "add_compile_options(-Werror)" "" ''; cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DINSTALL_LLLC=ON" + "-DTESTS=OFF" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost z3 ]; - meta = { + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = [ stdenv.lib.maintainers.dbrock ]; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ dbrock akru ]; inherit version; }; } diff --git a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch new file mode 100644 index 000000000000..499fc46c6caf --- /dev/null +++ b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch @@ -0,0 +1,24 @@ +diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt +index 97b01c83..0bdec4b4 100644 +--- a/libsolidity/CMakeLists.txt ++++ b/libsolidity/CMakeLists.txt +@@ -28,7 +28,7 @@ else() + endif() + + add_library(solidity ${sources} ${headers}) +-target_link_libraries(solidity PUBLIC evmasm devcore) ++target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) + + if (${Z3_FOUND}) + target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) +diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt +index 5c480093..d6538ee2 100644 +--- a/lllc/CMakeLists.txt ++++ b/lllc/CMakeLists.txt +@@ -1,5 +1,5 @@ + add_executable(lllc main.cpp) +-target_link_libraries(lllc PRIVATE lll) ++target_link_libraries(lllc PRIVATE lll ${Boost_SYSTEM_LIBRARY}) + + if (INSTALL_LLLC) + include(GNUInstallDirs) diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch new file mode 100644 index 000000000000..732797e5ae7d --- /dev/null +++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ac56b43..dacf3853 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,6 +48,19 @@ add_subdirectory(libevmasm) + add_subdirectory(libsolidity) + add_subdirectory(libsolc) + ++install(DIRECTORY libdevcore/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY libevmasm/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevmasm ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY libsolidity/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY liblll/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll ++ FILES_MATCHING PATTERN "*.h") ++ + if (NOT EMSCRIPTEN) + add_subdirectory(solc) + add_subdirectory(liblll) +diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt +index fa7e3f48..1f9f52b4 100644 +--- a/libdevcore/CMakeLists.txt ++++ b/libdevcore/CMakeLists.txt +@@ -6,3 +6,4 @@ target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Bo + target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}") + target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) + add_dependencies(devcore solidity_BuildInfo.h) ++install(TARGETS devcore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt +index 86192c1b..e7f15e93 100644 +--- a/libevmasm/CMakeLists.txt ++++ b/libevmasm/CMakeLists.txt +@@ -3,3 +3,4 @@ file(GLOB headers "*.h") + + add_library(evmasm ${sources} ${headers}) + target_link_libraries(evmasm PUBLIC jsoncpp devcore) ++install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt +index 4cdc073a..b61f03c7 100644 +--- a/liblll/CMakeLists.txt ++++ b/liblll/CMakeLists.txt +@@ -3,3 +3,4 @@ file(GLOB headers "*.h") + + add_library(lll ${sources} ${headers}) + target_link_libraries(lll PUBLIC evmasm devcore) ++install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt +index 97b01c83..e876177e 100644 +--- a/libsolidity/CMakeLists.txt ++++ b/libsolidity/CMakeLists.txt +@@ -28,7 +28,8 @@ else() + endif() + + add_library(solidity ${sources} ${headers}) + target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ++install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if (${Z3_FOUND}) + target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index c56ea8cc6495..5289540e944c 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz }: +{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.2.0"; name = "souffle-${version}"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "13j14227dgxcm25z9iizcav563wg2ak9338pb03aqqz8yqxbmz4n"; + sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; }; buildInputs = [ autoconf automake boost bison flex openjdk + # Used for 1.2.0 + libtool lsb-release ncurses zlib sqlite # Used for docs doxygen perl graphviz ]; patchPhase = '' substituteInPlace configure.ac \ - --replace "m4_esyscmd([git describe --tags --abbrev=0 | tr -d '\n'])" "${version}" + --replace "m4_esyscmd([git describe --tags --abbrev=0 --always | tr -d '\n'])" "${version}" ''; # Without this, we get an obscure error about not being able to find a library version @@ -29,17 +31,11 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; - # in 1.0.0: parser.hh:40:0: error: unterminated #ifndef - enableParallelBuilding = false; - - # See https://github.com/souffle-lang/souffle/issues/176 - hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/"; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin wchresta ]; license = licenses.upl; }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index cf1036283126..4ed59fb66622 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -107,31 +107,6 @@ self: super: { ## On Hackage: - ## Upstreamed, awaiting a Hackage release - haskell-gi = overrideCabal super.haskell-gi (drv: { - ## Setup: Encountered missing dependencies: - ## haskell-gi-base ==0.20.* - src = pkgs.fetchFromGitHub { - owner = "haskell-gi"; - repo = "haskell-gi"; - rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; - sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; - }; - }); - - ## Upstreamed, awaiting a Hackage release - haskell-gi-base = overrideCabal super.haskell-gi-base (drv: { - ## Setup: Encountered missing dependencies: - ## haskell-gi-base ==0.21.* - src = pkgs.fetchFromGitHub { - owner = "haskell-gi"; - repo = "haskell-gi"; - rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; - sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; - }; - prePatch = "cd base; "; - }); - ## Upstreamed, awaiting a Hackage release http-api-data = overrideCabal super.http-api-data (drv: { ## • No instance for (Semigroup Form) @@ -177,34 +152,7 @@ self: super: { prePatch = "cd lambdacube-ir.haskell; "; }); - ## Upstreamed, awaiting a Hackage release - simple-reflect = overrideCabal super.simple-reflect (drv: { - ## • No instance for (Semigroup Expr) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Expr’ - src = pkgs.fetchFromGitHub { - owner = "twanvl"; - repo = "simple-reflect"; - rev = "c357e55da9a712dc5dbbfe6e36394e4ada2db310"; - sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq"; - }; - }); - singletons = super.singletons_2_4_1; - - ## Upstreamed, awaiting a Hackage release - tar = overrideCabal super.tar (drv: { - ## • No instance for (Semigroup (Entries e)) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid (Entries e)’ - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "tar"; - rev = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8"; - sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny"; - }; - }); - th-desugar = super.th-desugar_1_8; ## Upstreamed, awaiting a Hackage release @@ -245,54 +193,6 @@ self: super: { libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]); }); - ## Unmerged. PR: https://github.com/dhall-lang/dhall-haskell/pull/321 - dhall = overrideCabal super.dhall (drv: { - ## • No instance for (Semigroup (Parser Builder)) - ## arising from a use of ‘<>’ - ## There are instances for similar types: - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "dhall-haskell"; - rev = "38f3d8c861e137da6d8ac8eab88aec1c359efcac"; - sha256 = "1pya7lhdjsygk622k1g3whj0a7jqwyym26ikxbn1anxypnb0n2wy"; - }; - ## Setup: Encountered missing dependencies: - ## prettyprinter >=1.2.0.1 && <1.3 - jailbreak = true; - ## Setup: Encountered missing dependencies: - ## insert-ordered-containers -any, - ## lens-family-core -any, - ## prettyprinter-ansi-terminal -any, - ## repline -any - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]); - }); - - ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 - gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: { - ## Setup: Encountered missing dependencies: - ## Cabal >=1.24.0.0 && <2.1 - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "gtk2hs"; - rev = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b"; - sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa"; - }; - prePatch = "cd tools; "; - }); - - ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 - hashtables = overrideCabal super.hashtables (drv: { - ## • No instance for (Semigroup Slot) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Slot’ - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "hashtables"; - rev = "b9eb4b10a50bd6250330422afecc065339a32412"; - sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw"; - }; - }); - ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -346,20 +246,6 @@ self: super: { }; }); - ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 - wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘PP.<>’, - ## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36 - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "wl-pprint-text"; - rev = "615b83d1e5be52d1448aa1ab2517b431a617027b"; - sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i"; - }; - }); - - ## Non-code, configuration-only change adjunctions = overrideCabal super.adjunctions (drv: { @@ -556,12 +442,16 @@ self: super: { # Older versions don't compile. brick = self.brick_0_36_3; + dhall = self.dhall_1_13_0; + dhall_1_13_0 = doJailbreak super.dhall_1_13_0; # support ansi-terminal 0.8.x HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; + wl-pprint-text = self.wl-pprint-text_1_1_1_1; + base-compat = self.base-compat_0_10_1; # https://github.com/xmonad/xmonad/issues/155 xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f3ea3b8954f5..e9d076343f82 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7353,6 +7353,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HCodecs_0_5_1" = callPackage + ({ mkDerivation, array, base, bytestring, QuickCheck, random + , semigroups + }: + mkDerivation { + pname = "HCodecs"; + version = "0.5.1"; + sha256 = "0hrib81nw4g7qgka3brypb8k1mg7l37m8gywc7bc44mcg5mn2957"; + libraryHaskellDepends = [ + array base bytestring QuickCheck random semigroups + ]; + testHaskellDepends = [ + array base bytestring QuickCheck random semigroups + ]; + homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze"; + description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HDBC" = callPackage ({ mkDerivation, base, bytestring, containers, convertible, mtl , old-time, text, time, utf8-string @@ -9540,8 +9560,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.4.0"; - sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f"; + version = "0.4.1"; + sha256 = "08skn3qvqfzll1hhzayqm46kwdl45kbckgwvzjm4bqa5w5jvh708"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit exceptions http-client http-conduit http-types mime-types MissingH resourcet text @@ -10446,6 +10466,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.0.3"; + sha256 = "17bk63qi9krfghplrmck4v1hv54kwdppl50hfm7349dqfhdbf129"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -15358,8 +15398,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "QuickCheck-safe"; - version = "0.1.0.3"; - sha256 = "0fwnywnmdws04f1y7qw0l8hawa2hn99x62g1mpjwcdx8dm4yal7f"; + version = "0.1.0.4"; + sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7"; libraryHaskellDepends = [ base QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -16619,7 +16659,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; mono = null;}; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either @@ -21089,17 +21129,17 @@ self: { ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring , bytestring, containers, exceptions, filepath, http-client , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random - , safe-exceptions, stm, tasty, tasty-hunit, text, th-format + , safe-exceptions, say, stm, tasty, tasty-hunit, text, th-format , transformers, unliftio, unliftio-core, uuid }: mkDerivation { pname = "access-token-provider"; - version = "0.1.0.0"; - sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q"; + version = "0.1.1.0"; + sha256 = "18j07sb100zb407n7dpyppi5mc20g57y73k3sscmvlgq6yqdxwk4"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring containers exceptions filepath http-client http-client-tls http-types katip - lens lens-aeson mtl random safe-exceptions stm text th-format + lens lens-aeson mtl random safe-exceptions say stm text th-format transformers unliftio unliftio-core ]; testHaskellDepends = [ @@ -23772,12 +23812,12 @@ self: { }) {}; "alg" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.1.0"; - sha256 = "13glk774rdd6fwi427djkc1q4xqmdf44smhp5lgv24vfwd5fffcq"; - libraryHaskellDepends = [ base ]; + version = "0.2.2.0"; + sha256 = "1hhmzlq831618j36yq8kjh4sagmhg3w1ghr53lip06avis2c0gl7"; + libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28464,10 +28504,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.0.1"; - sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877"; - revision = "1"; - editedCabalFile = "1mmrv81c9gwa2gqlp0agipg5sdxm88fhiza84y2sv8vg7zf88x82"; + version = "0.10.0.2"; + sha256 = "13jmv7bxiy0v2y2w6qwsb9mh5m97sxrlb5w1kaqzag8d0cnz7w6c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32529,6 +32567,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_2_0_0" = callPackage + ({ mkDerivation, base, bifunctors, containers, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, reflection, time, transformers, type-combinators + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.2.0.0"; + sha256 = "1h2cb3birbcgm0fyqr4i2d85dkwrpbqkd67a6imh3z9nsc7zy66y"; + libraryHaskellDepends = [ + base containers deepseq microlens primitive reflection transformers + type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -33709,7 +33771,7 @@ self: { , codec-rpm, cond, conduit, conduit-combinators, conduit-extra , containers, content-store, cpio-conduit, cryptonite, directory , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree - , gitrev, hspec, http-conduit, HUnit, listsafe, memory + , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory , monad-control, monad-logger, monad-loops, mtl, network-uri , ostree, parsec, parsec-numbers, persistent, persistent-sqlite , persistent-template, process, regex-pcre, resourcet, split, tar @@ -33718,8 +33780,8 @@ self: { }: mkDerivation { pname = "bdcs"; - version = "0.4.0"; - sha256 = "008rd17zfg63w9szp4jrbd9z9sg4zjf4j4a5gm3skhn2nq7qaw9i"; + version = "0.5.0"; + sha256 = "1anb8nz25a0cvfn6ksn01y6sbjg3cn9pd8lwg8hpjza11hm33kcg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33728,10 +33790,10 @@ self: { aeson base bytestring codec-rpm cond conduit conduit-combinators conduit-extra containers content-store cpio-conduit cryptonite directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree - gitrev http-conduit listsafe memory monad-control monad-logger mtl - network-uri parsec parsec-numbers persistent persistent-sqlite - persistent-template process regex-pcre resourcet split tar - tar-conduit temporary text time unix unordered-containers + gitrev http-conduit lifted-base listsafe memory monad-control + monad-logger mtl network-uri parsec parsec-numbers persistent + persistent-sqlite persistent-template process regex-pcre resourcet + split tar tar-conduit temporary text time unix unordered-containers xml-conduit ]; libraryPkgconfigDepends = [ ostree ]; @@ -33862,6 +33924,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-migrate_0_3_2_0" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text + , time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.3.2.0"; + sha256 = "1a6m27cpa2xlwmwfi1374p3a23i2hm8fjfsl6bdn0zpnawgi5rhf"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel + pqueue pretty scientific text time unordered-containers uuid-types + vector + ]; + homepage = "https://travis.athougies.net/projects/beam.html"; + description = "SQL DDL support and migrations support library for Beam"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-postgres" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring , case-insensitive, conduit, free, hashable, haskell-src-exts @@ -37989,8 +38073,8 @@ self: { }: mkDerivation { pname = "bloodhound-amazonka-auth"; - version = "0.1.2.0"; - sha256 = "1r9fj8zh9swdmy0f96112kpm1s50wlyf194w2km4rpq2hblcjlrm"; + version = "0.1.2.1"; + sha256 = "06h3yw5fy6y1vr0zd059p3whm2mlfqwi9vjz80rwq7w6lv0p85a8"; libraryHaskellDepends = [ amazonka-core amazonka-elasticsearch base bloodhound exceptions http-client http-types time transformers uri-bytestring @@ -39392,33 +39476,31 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; - "brittany_0_10_0_0" = callPackage + "brittany_0_11_0_0" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty - , safe, semigroups, strict, syb, text, transformers, uniplate - , unsafe, yaml + , random, safe, semigroups, strict, syb, text, transformers + , uniplate, unsafe, yaml }: mkDerivation { pname = "brittany"; - version = "0.10.0.0"; - sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1"; - revision = "1"; - editedCabalFile = "1mq1hgakxwzk4k4d8gwfbngprcprjagnvkvq389z1m1vda3w80i8"; + version = "0.11.0.0"; + sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith data-tree-print deepseq directory extra filepath ghc ghc-boot-th ghc-exactprint ghc-paths monad-memo mtl multistate - neat-interpolation pretty safe semigroups strict syb text + neat-interpolation pretty random safe semigroups strict syb text transformers uniplate unsafe yaml ]; executableHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths hspec monad-memo mtl multistate + ghc-exactprint ghc-paths monad-memo mtl multistate neat-interpolation pretty safe semigroups strict syb text transformers uniplate unsafe yaml ]; @@ -40655,8 +40737,8 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.9"; - sha256 = "1gqcr15956zzldsc3rvds3ybd43907bv69cw3i7a1c0nfz60zg70"; + version = "1.2"; + sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -41909,6 +41991,8 @@ self: { pname = "cabal-test-quickcheck"; version = "0.1.8.1"; sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn"; + revision = "1"; + editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; @@ -44207,8 +44291,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.0.1"; - sha256 = "16pzba0zc346d3azw4wd90apz7ldx68d5vd3q13dd3s9f3gqy4wv"; + version = "0.1.0.2"; + sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45697,14 +45781,17 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector + ({ mkDerivation, aeson, base, bytestring, hourglass, hspec + , QuickCheck, text, time, vector }: mkDerivation { pname = "chronologique"; - version = "0.3.0.1"; - sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14"; - libraryHaskellDepends = [ base hourglass time vector ]; - testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; + version = "0.3.1.1"; + sha256 = "05ly96mdm4nxmn7yz04wq9kgzlq8biaaaxs1mvsc3f8wgcpbqf65"; + libraryHaskellDepends = [ aeson base hourglass text time vector ]; + testHaskellDepends = [ + aeson base bytestring hourglass hspec QuickCheck vector + ]; homepage = "https://github.com/afcowie/chronologique/"; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; @@ -47736,7 +47823,7 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; mono = null;}; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "clr-inline" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive @@ -50189,12 +50276,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_4_0_3" = callPackage + "composition-prelude_1_4_0_5" = callPackage ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.4.0.3"; - sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj"; + version = "1.4.0.5"; + sha256 = "0bcz7lx4v25dz9d11qy8im6fk1gviqqhgcr1bwxg4yqyzbfl8bas"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; @@ -53780,6 +53867,29 @@ self: { license = "unknown"; }) {}; + "cql_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, Decimal + , iproute, network, QuickCheck, tasty, tasty-quickcheck + , template-haskell, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "cql"; + version = "4.0.0"; + sha256 = "09sm9wxjfmiv62brrj6hcfsjz3s8xwc4ihrwxdq8fqsv9cf82fj7"; + libraryHaskellDepends = [ + base bytestring cereal containers Decimal iproute network + template-haskell text time transformers uuid vector + ]; + testHaskellDepends = [ + base bytestring cereal Decimal iproute network QuickCheck tasty + tasty-quickcheck text time uuid + ]; + homepage = "https://gitlab.com/twittner/cql/"; + description = "Cassandra CQL binary protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, exceptions, hashable @@ -53791,6 +53901,8 @@ self: { pname = "cql-io"; version = "0.16.0"; sha256 = "012043s6cfkybj764hlrc7i9ql6afl79s2vnjbn9vz99p7wszrc2"; + revision = "1"; + editedCabalFile = "07vrizkarip8ap5hp6ngp7yf8xfdmm3r6zbaxafk48raxyfkl8xd"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable HsOpenSSL iproute lens @@ -53802,6 +53914,35 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "cql-io_1_0_0" = callPackage + ({ mkDerivation, async, auto-update, base, bytestring, containers + , cql, cryptohash, data-default-class, Decimal, exceptions + , hashable, HsOpenSSL, iproute, lens, monad-control, mtl + , mwc-random, network, raw-strings-qq, retry, semigroups, stm + , tasty, tasty-hunit, text, time, tinylog, transformers + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "cql-io"; + version = "1.0.0"; + sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx"; + libraryHaskellDepends = [ + async auto-update base bytestring containers cql cryptohash + data-default-class exceptions hashable HsOpenSSL iproute lens + monad-control mtl mwc-random network retry semigroups stm text time + tinylog transformers transformers-base unordered-containers uuid + vector + ]; + testHaskellDepends = [ + base containers cql Decimal iproute mtl raw-strings-qq tasty + tasty-hunit text time tinylog uuid + ]; + homepage = "https://gitlab.com/twittner/cql-io/"; + description = "Cassandra CQL client"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cqrs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59010,6 +59151,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "datafix" = callPackage + ({ mkDerivation, base, Cabal, cabal-toolkit, containers, criterion + , deepseq, directory, doctest, filepath, ghc, ghc-paths, Glob + , lattices, pomaps, primitive, QuickCheck, tasty, tasty-hunit + , tasty-smallcheck, text, transformers, turtle, vector + }: + mkDerivation { + pname = "datafix"; + version = "0.0.0.1"; + sha256 = "0pdpqwdbc8hmwwq460yisbj4072x3jyh7gcrf1flm2545acgahvq"; + setupHaskellDepends = [ base Cabal cabal-toolkit ]; + libraryHaskellDepends = [ + base containers lattices pomaps primitive transformers vector + ]; + testHaskellDepends = [ + base Cabal cabal-toolkit containers directory doctest filepath ghc + ghc-paths Glob lattices primitive QuickCheck tasty tasty-hunit + tasty-smallcheck text transformers turtle + ]; + benchmarkHaskellDepends = [ + base Cabal cabal-toolkit containers criterion deepseq directory + filepath ghc ghc-paths lattices primitive text transformers turtle + ]; + homepage = "https://github.com/sgraf812/datafix"; + description = "Fixing data-flow problems"; + license = stdenv.lib.licenses.isc; + }) {}; + "dataflow" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , filepath, gitrev, hastache, hspec, HUnit, markdown, MissingH, mtl @@ -60490,8 +60659,8 @@ self: { ({ mkDerivation, base, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.2.1"; - sha256 = "0i8wzih07532zw276h271lzdk3lkinjsjyhn8lks04yqkgq4b2x8"; + version = "0.2.3"; + sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1"; libraryHaskellDepends = [ base foldl ]; homepage = "https://github.com/metrix-ai/deferred-folds"; description = "Abstractions over deferred folds"; @@ -71675,6 +71844,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exhaustive_1_1_6" = callPackage + ({ mkDerivation, base, generics-sop, template-haskell, transformers + }: + mkDerivation { + pname = "exhaustive"; + version = "1.1.6"; + sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk"; + libraryHaskellDepends = [ + base generics-sop template-haskell transformers + ]; + homepage = "http://github.com/ocharles/exhaustive"; + description = "Compile time checks that a computation considers producing data through all possible constructors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exherbo-cabal" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal , containers, data-default, deepseq, directory, doctest, filepath @@ -72308,15 +72493,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_6_0_1" = callPackage + "extensible-effects_2_6_1_1" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, mtl , QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.6.0.1"; - sha256 = "1c39hn8iskn71s3hd3af3q1xym9mzdvrjswcnyqrkibws47k2lmx"; + version = "2.6.1.1"; + sha256 = "0rx1m6pw2prgfr0wsgnqf1hqsrwq43clpahk79z972bdmh9v3352"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control QuickCheck silently test-framework @@ -81108,12 +81293,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_5_0_0" = callPackage + "genvalidity_0_5_0_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.5.0.0"; - sha256 = "0s640ql6i9lr8s8m39fvjv7iz1pbcnjnvb8xsdbygb49cwk3khcz"; + version = "0.5.0.2"; + sha256 = "1l1lv8k8gl7i5zd54636ihbwddgq49088lgb2gragm05cki823c1"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -81230,6 +81415,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-containers_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-containers + }: + mkDerivation { + pname = "genvalidity-containers"; + version = "0.4.0.0"; + sha256 = "0q7dzmp8ik3v8ckv8i9cnc687306i4i80mx7sbh956hw5kr6bqnb"; + libraryHaskellDepends = [ + base containers genvalidity QuickCheck validity validity-containers + ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity @@ -81251,14 +81456,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_0" = callPackage + "genvalidity-hspec_0_6_0_1" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.0"; - sha256 = "0pa4wx08yipr59nsdf5prh6j5pcixnxxfd9i4vm1rb4v89nws6al"; + version = "0.6.0.1"; + sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -81606,14 +81811,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-time_0_2_0_0" = callPackage + "genvalidity-time_0_2_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: mkDerivation { pname = "genvalidity-time"; - version = "0.2.0.0"; - sha256 = "04kfqs4mc9p5flr3vvb6qj3nb4agpl3hww62g7np6sl5s36cbycb"; + version = "0.2.0.1"; + sha256 = "0kd2rxmz197yzfhxya4pbvl77iv7knl0zc1v56089ls4vk4by2gg"; libraryHaskellDepends = [ base genvalidity QuickCheck time validity-time ]; @@ -97235,6 +97440,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec + , lens, mtl, network-uri, parsec, sorted-list, stm, text, time + , transformers, unordered-containers, vector, yi-rope + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.2.1.0"; + sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable haskell-lsp-types hslogger lens mtl network-uri parsec + sorted-list stm text time unordered-containers yi-rope + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hslogger lens mtl network-uri parsec stm text time transformers + unordered-containers vector yi-rope + ]; + testHaskellDepends = [ + aeson base containers directory filepath hashable hspec lens + network-uri sorted-list text yi-rope + ]; + homepage = "https://github.com/alanz/haskell-lsp"; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -97256,6 +97493,23 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "haskell-lsp-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, filepath + , hashable, lens, network-uri, text, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.2.1.0"; + sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0"; + libraryHaskellDepends = [ + aeson base bytestring data-default filepath hashable lens + network-uri text unordered-containers + ]; + homepage = "https://github.com/alanz/haskell-lsp"; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -97414,8 +97668,8 @@ self: { }: mkDerivation { pname = "haskell-packages"; - version = "0.6.1"; - sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs"; + version = "0.6.2"; + sha256 = "114xkqg5fzyq1n5p8cz768z84j0xgcyzxh375p9a574j6nl6d387"; libraryHaskellDepends = [ base binary bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged @@ -97746,6 +98000,8 @@ self: { pname = "haskell-src-exts-util"; version = "0.2.2"; sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg"; + revision = "1"; + editedCabalFile = "14mrpj2xmpdhib9l5qacslkm4n0rh5yjwy6n5dhp7152m69hgfdl"; libraryHaskellDepends = [ base containers data-default haskell-src-exts semigroups transformers uniplate @@ -97755,6 +98011,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts-util_0_2_3" = callPackage + ({ mkDerivation, base, containers, data-default, haskell-src-exts + , semigroups, transformers, uniplate + }: + mkDerivation { + pname = "haskell-src-exts-util"; + version = "0.2.3"; + sha256 = "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8"; + libraryHaskellDepends = [ + base containers data-default haskell-src-exts semigroups + transformers uniplate + ]; + homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; + description = "Helper functions for working with haskell-src-exts trees"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta" = callPackage ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb , template-haskell, test-framework, test-framework-hunit @@ -105340,8 +105614,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.9"; - sha256 = "10lsh1rayzg7gri6b2mn01ncjziga5dzw0s5a91068brrrf4rymm"; + version = "1.9.1"; + sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105380,21 +105654,22 @@ self: { }) {}; "hledger-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, Decimal - , docopt, either, hledger, hledger-lib, microlens + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , Decimal, docopt, either, hledger, hledger-lib, microlens , microlens-platform, safe, servant-server, servant-swagger , swagger2, text, transformers, wai, wai-extra, warp }: mkDerivation { pname = "hledger-api"; - version = "1.9"; - sha256 = "00bqsz8hkmx78r9d692kihbpmldkpnsdmpljs3ivi14jfay4avim"; + version = "1.9.1"; + sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring containers Decimal docopt either hledger - hledger-lib microlens microlens-platform safe servant-server - servant-swagger swagger2 text transformers wai wai-extra warp + aeson base bytestring containers data-default Decimal docopt either + hledger hledger-lib microlens microlens-platform safe + servant-server servant-swagger swagger2 text transformers wai + wai-extra warp ]; homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; @@ -105445,8 +105720,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.4"; - sha256 = "1dii629ynrb04q4hmli6zxpz1ylkw0rm1vf8jrrcm81drvdxw6qm"; + version = "1.3.5"; + sha256 = "0mp8jhvf48173ixypqfm9vmsb2bsykfygxrxxfjpry6m5xqfh09c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105474,11 +105749,10 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.1"; - sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha"; + version = "1.5.2"; + sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ base Cabal Decimal hledger-lib mtl text time ]; @@ -105511,28 +105785,28 @@ self: { , blaze-markup, bytestring, cmdargs, containers, csv, data-default , Decimal, deepseq, directory, doctest, easytest, extra, filepath , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time - , parsec, pretty-show, regex-tdfa, safe, split, test-framework - , test-framework-hunit, text, time, transformers, uglymemo - , utf8-string + , parsec, pretty-show, regex-tdfa, safe, split, tabular + , test-framework, test-framework-hunit, text, time, transformers + , uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.9"; - sha256 = "0bm4vdzjxyxjmq000wng6hkx9kinbzw5hx7m0i1vjj500gcp0zq1"; + version = "1.9.1"; + sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az"; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory extra filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split text time transformers uglymemo - utf8-string + pretty-show regex-tdfa safe split tabular text time transformers + uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory doctest easytest extra filepath Glob hashtables HUnit megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split - test-framework test-framework-hunit text time transformers uglymemo - utf8-string + tabular test-framework test-framework-hunit text time transformers + uglymemo utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; @@ -105548,8 +105822,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.9"; - sha256 = "0z5w69vxl8f1gdc8753ndnm4mcm5xw3abjfqidyrn3gsi800pxzd"; + version = "1.9.1"; + sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105594,8 +105868,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.9.1"; - sha256 = "0fkanj21ivrf5la7zxij1jws955hc0y98n2lg4qkbyw5fz54i9dj"; + version = "1.9.2"; + sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105728,8 +106002,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.3"; - sha256 = "08i7b894vm0p8ipilvhx0pp04r6zgrf44w0mnlmsydq971y59g3a"; + version = "2.1.4"; + sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106741,8 +107015,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.7.1"; - sha256 = "05l2ngns8p3jvx20iv8w4yrzn1agfxafgaynfwv0340czchl7s5s"; + version = "1.7.2"; + sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107054,10 +107328,10 @@ self: { ({ mkDerivation, base, either, mtl }: mkDerivation { pname = "hoist-error"; - version = "0.1.0.2"; - sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; - revision = "3"; - editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6"; + version = "0.2.0.0"; + sha256 = "1hb479bwn3z1qdsrnz85wfdd9skmmxydxd6xkcrwbcfwy5vap64h"; + revision = "1"; + editedCabalFile = "1nai9ds3r15x78rnj5gvy3mbps2jkq9ndqg56l8g7rxizfzidwfb"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -108910,8 +109184,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.8"; - sha256 = "1h3zjl1z80h7n1k1sk4a2qwsnq17c48f1lmzrdhrs9h5bnm9mjhk"; + version = "2.4.9"; + sha256 = "1bfar7biksa9ha6vzrh4z2lz048mf1zz261ih6mbl9q6kvyr27w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112186,6 +112460,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-golden-aeson_0_6_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt + , random, silently, transformers + }: + mkDerivation { + pname = "hspec-golden-aeson"; + version = "0.6.0.0"; + sha256 = "0918b4y0lkz66hyhydqkd0yxna37vqqqc0pgjg4vn1h860xj0rv0"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck quickcheck-arbitrary-adt random transformers + ]; + testHaskellDepends = [ + aeson base directory hspec hspec-core QuickCheck + quickcheck-arbitrary-adt silently transformers + ]; + homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; + description = "Use tests to monitor changes in Aeson serialization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-hashable" = callPackage ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck , silently @@ -116105,8 +116402,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.4.4"; - sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf"; + version = "2.5.0"; + sha256 = "0cr3s26ivb46d14mglnr9phhnsj85h8n3b8p6lmcjk1xs4jidick"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116129,8 +116426,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.4.0"; - sha256 = "0xzsdslkc069wccqihd50zxvm9jx6p5izwf4v44dizn42lfymm75"; + version = "2.5.0"; + sha256 = "0n495336vhikd0r5j6i8ydrxv3xwwckbg2ympaf3flcsjv4bwc08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116272,16 +116569,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_11_0_0" = callPackage + "hw-rankselect_0_12_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap - , QuickCheck, resourcet, vector + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens + , mmap, mtl, optparse-applicative, QuickCheck, resourcet, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.11.0.0"; - sha256 = "0sywcqzrrxmlwgg4glj8fm8fn4n1a33f20lmj9bvchzh20gg340c"; + version = "0.12.0.0"; + sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116289,7 +116586,8 @@ self: { vector ]; executableHaskellDepends = [ - base directory hw-bits hw-prim hw-rankselect-base mmap vector + base directory hw-bits hw-prim hw-rankselect-base lens mmap mtl + optparse-applicative vector ]; testHaskellDepends = [ base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog @@ -120204,6 +120502,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_6_0_6" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.6.0.6"; + sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -121366,6 +121690,8 @@ self: { pname = "io-streams"; version = "1.5.0.1"; sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; + revision = "1"; + editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c"; configureFlags = [ "-fNoInteractiveTests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -121389,8 +121715,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.0.2"; sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "1"; - editedCabalFile = "0mm20k4d6xcjjghwkgbfap9n35nixzvk3y0n52f88cq0rfrn1y0r"; + revision = "2"; + editedCabalFile = "0jrasbn4s6ac0691bf88fbflpha2vn24bd45gk0s3znvl395dxgr"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -125180,8 +125506,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3.2"; - sha256 = "098vli26hrgkjxw3y1sfc7fi3wj72ka1dqy1k49z22rigisffbwj"; + version = "0.3.5"; + sha256 = "1ibx0pr0ddnzx5jbgkjzidkmja65gan7ji7s42v2iwn05fm125ki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132103,6 +132429,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {systemd = null;}; + "libsystemd-journal_1_4_3" = callPackage + ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes + , pipes-safe, semigroups, systemd, text, transformers, uniplate + , unix-bytestring, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "libsystemd-journal"; + version = "1.4.3"; + sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq"; + libraryHaskellDepends = [ + base bytestring hashable hsyslog pipes pipes-safe semigroups text + transformers uniplate unix-bytestring unordered-containers uuid + vector + ]; + libraryPkgconfigDepends = [ systemd ]; + homepage = "http://github.com/ocharles/libsystemd-journal"; + description = "Haskell bindings to libsystemd-journal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {systemd = null;}; + "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: mkDerivation { @@ -135207,6 +135554,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_6" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.6"; + sha256 = "091ii2cq5wns9mc3mckwjcjgav9s2jj8nnamwqd2vf24w932ilv7"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -139965,6 +140336,8 @@ self: { pname = "megaparsec"; version = "6.5.0"; sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; + revision = "1"; + editedCabalFile = "1gfqxpzjr64jzj366ibxm5l55qba5jw7wnpc89b0mf8f752h5w1l"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -142316,8 +142689,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "1"; - editedCabalFile = "02b0ycywjhzx1ll36l38mwp2gy677hgsqpq2mwyi277ykbrwnsdk"; + revision = "2"; + editedCabalFile = "0hzz7l9npv364yzw6i6q6699nn1raj1p2cmwmlqp43rz8s3ryawn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -149285,6 +149658,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-carbon_1_0_12" = callPackage + ({ mkDerivation, base, bytestring, network, text, time, vector }: + mkDerivation { + pname = "network-carbon"; + version = "1.0.12"; + sha256 = "0fb1ymk1rnsppvil46pyaxlzc09l6716jbrr0h7rb5nxv0bvk5pd"; + libraryHaskellDepends = [ + base bytestring network text time vector + ]; + homepage = "http://github.com/ocharles/network-carbon"; + description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { @@ -152740,8 +153128,8 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.0.4"; - sha256 = "1fh8yqdycna3if5dd55qc6hic70nwy71vjy2yflzvpjpqkdd8qz6"; + version = "0.0.5"; + sha256 = "06b52hd9bxidp62y2h856ac90pypcv72q533i7lywf4gjj1q0grn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156012,8 +156400,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.1.0"; - sha256 = "11lvsr30f0x2vsqnwr4s3j9v3n4zxx5a83qc95j5c1xijlrzcc3k"; + version = "0.3.2.0"; + sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159569,6 +159957,8 @@ self: { pname = "persistent"; version = "2.8.2"; sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"; + revision = "1"; + editedCabalFile = "18a6dfpjakcmyl9qnflgi63rss09zj3xg0py6bliary4y2cqw4fz"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger haskell-src-meta @@ -162583,6 +162973,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "planb-token-introspection" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , exceptions, http-client, http-client-tls, http-types, lens, mtl + , random, safe-exceptions, tasty, tasty-hunit, text, th-format + , transformers, unliftio-core + }: + mkDerivation { + pname = "planb-token-introspection"; + version = "0.1.1.0"; + sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers http-client + http-client-tls http-types mtl safe-exceptions text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions http-client http-types + lens mtl random safe-exceptions tasty tasty-hunit text th-format + unliftio-core + ]; + homepage = "https://github.com/mtesseract/planb-token-introspection#readme"; + description = "Token Introspection for PlanB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plankton" = callPackage ({ mkDerivation, adjunctions, base, protolude }: mkDerivation { @@ -162872,15 +163286,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "plot-light_0_3_3" = callPackage + "plot-light_0_3_3_2" = callPackage ({ mkDerivation, base, blaze-svg, colour, containers , data-default-class, hspec, mtl, QuickCheck, scientific, text , time }: mkDerivation { pname = "plot-light"; - version = "0.3.3"; - sha256 = "1ymfrrn28l6dbvw6m6j0cqxjb027ynhcc7b7y6i7bq4gq6rd60dz"; + version = "0.3.3.2"; + sha256 = "0im5rw52aim1zspisdar87gyn1ar4dkk52ipcq0s41pcycbwib12"; libraryHaskellDepends = [ base blaze-svg colour containers data-default-class mtl scientific text time @@ -168128,6 +168542,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_9" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.9"; + sha256 = "0d6j5k8mfxnixx9n6v7vwncy49cx9sxkhjgh1g7sbs1q15rxkn6m"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -168143,6 +168575,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_9" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.9"; + sha256 = "0641cwi7lb53w4mi1icbgz0yghz4lwdf16y9pi0f188hp31f3b2j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -189138,6 +189586,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_1" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.1"; + sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss"; + libraryHaskellDepends = [ base singletons ]; + homepage = "https://github.com/AndrasKovacs/singleton-nats"; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -190754,6 +191215,8 @@ self: { pname = "snap-core"; version = "1.0.3.2"; sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; + revision = "1"; + editedCabalFile = "08ll71h3rv9bppr7xrflg4y627vnmxgfhby1kli9cj0a7ryspam1"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -191005,6 +191468,8 @@ self: { pname = "snap-server"; version = "1.1.0.0"; sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; + revision = "1"; + editedCabalFile = "1lyx51zr1cmjyvsfplxpzv87agvvv83v3ww8m01fdh7x31np1chc"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -193095,8 +193560,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.1.4"; - sha256 = "0awj1gbrcdq4xp9dgj7q3jbfivjb4pjhkhd3acfgdqk08142fzj7"; + version = "0.0.1.6"; + sha256 = "10kj0ir2i72q20jbp39n5v700pivbapkyvarql9hg5sci9s73g4s"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -195013,8 +195478,8 @@ self: { }: mkDerivation { pname = "stack-network"; - version = "0.1.0.0"; - sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak"; + version = "0.1.0.1"; + sha256 = "1skq3sqr5krn6gh5h684vn2w2h8zvqkdcc7yhbyri2fswahy9g1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197336,6 +197801,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-base64" = callPackage + ({ mkDerivation, base, safe-exceptions, streaming + , streaming-bytestring, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "streaming-base64"; + version = "0.1.0.0"; + sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; + libraryHaskellDepends = [ + base safe-exceptions streaming streaming-bytestring transformers + ]; + testHaskellDepends = [ + base streaming-bytestring tasty tasty-hunit + ]; + description = "Streaming conversion from/to base64"; + license = stdenv.lib.licenses.cc0; + }) {}; + "streaming-benchmarks" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit , csv, deepseq, directory, gauge, list-t, list-transformer, logict @@ -198735,8 +199218,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.1.1"; - sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss"; + version = "0.9.2.0"; + sha256 = "16r2nm1y0s5ybrq2pzsq00nfq7k0i70nyg7ynmhx76lld82i17yv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202825,6 +203308,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-rerun_1_1_11" = callPackage + ({ mkDerivation, base, containers, mtl, optparse-applicative + , reducers, split, stm, tagged, tasty, transformers + }: + mkDerivation { + pname = "tasty-rerun"; + version = "1.1.11"; + sha256 = "0nk2qfdhdl71xcr0rwixmwwsyr74dy4hjwalhs4p4am2bhpfva5s"; + libraryHaskellDepends = [ + base containers mtl optparse-applicative reducers split stm tagged + tasty transformers + ]; + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -205664,6 +206165,8 @@ self: { pname = "text-show-instances"; version = "3.6.4"; sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf"; + revision = "1"; + editedCabalFile = "0fb704bm4n99vv7cblzsg9l8i6gy2ybppp2xagh4mcrwn5g776l8"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time @@ -209469,17 +209972,21 @@ self: { }) {}; "tpdb" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text + ({ mkDerivation, base, bytestring, containers, data-default + , filepath, hashable, HaXml, hxt, mtl, parsec, pretty + , prettyprinter, text, time, xml-conduit, xml-hamlet }: mkDerivation { pname = "tpdb"; - version = "1.3.3"; - sha256 = "1xks4dcn51m3001ss231lmk8ylfpvba9d2v123vgwmjpibnkr9gs"; + version = "1.5.2"; + sha256 = "08cckg0n6pbj067advjppgybbwbl256igk4lirwmiav6hf1m723k"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers filepath hashable HaXml hxt mtl parsec - text time wl-pprint-text + base bytestring containers data-default filepath hashable HaXml hxt + mtl parsec prettyprinter text time xml-conduit xml-hamlet ]; + executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HaXml pretty ]; homepage = "https://github.com/jwaldmann/haskell-tpdb"; description = "Data Type for Rewriting Systems"; @@ -211526,8 +212033,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.1.4"; - sha256 = "0anln0il67j8xhz1m73r8b02560mc8yd1rzmc03p4f7vmgxqaphv"; + version = "2.1.5"; + sha256 = "1v94hf1fd7n01drd6hx37zrplpzlskfmd3l8lmkb5kzy618x0cnb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211544,8 +212051,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.1.4"; - sha256 = "0fapi6g8f6fp90hvff1g606wzi7jaacf1mnq1h801yzzi4sj3yms"; + version = "2.1.5"; + sha256 = "09q2dxab3s9d32ayr9a08q6lbkszrxi0hw00sar3jx31p9q3pkc2"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive transformers vector ]; @@ -212646,6 +213153,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_4_0_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq + , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck + , random, temporary, text, weigh + }: + mkDerivation { + pname = "type-of-html"; + version = "1.4.0.0"; + sha256 = "09dr97illgfn11javij6nmqp3cvgdf7air7kavxcdlr25nx6wkd7"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion deepseq ghc ghc-paths random + temporary text weigh + ]; + homepage = "https://github.com/knupfer/type-of-html"; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "type-of-html-static" = callPackage + ({ mkDerivation, base, template-haskell, type-of-html }: + mkDerivation { + pname = "type-of-html-static"; + version = "0.1.0.2"; + sha256 = "00329zkxlbsjlwnw2pz2w6ahiam5c1k9j9fv2608wjfmxr8xkcr9"; + libraryHaskellDepends = [ base template-haskell type-of-html ]; + testHaskellDepends = [ base type-of-html ]; + homepage = "https://github.com/knupfer/type-of-html-static"; + description = "Optimize static parts of type-of-html"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-operators" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -213129,8 +213672,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.6.1.1"; - sha256 = "0dmdwlfn73anw4ap74aqnldp42383c2mi12r9y7sf1j1gyy872ac"; + version = "0.6.2.1"; + sha256 = "0qa9vp1fg495b2ddzbdpivlzp0maap7jxqn2xd4z2rrxbrjdlhl2"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -214737,6 +215280,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "universum_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog + , text, transformers, type-operators, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "universum"; + version = "1.2.0"; + sha256 = "0645gvj1p33d0fnlk09i74l11sv11bidyv44hyb2m0dls22hr89p"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text transformers + type-operators unordered-containers utf8-string vector + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + homepage = "https://github.com/serokell/universum"; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix_2_7_2_2" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { @@ -216135,8 +216707,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.6.0"; - sha256 = "0qym7if90kp51f0mf8yxsw3csfpdp2mnp7aah3vc6wdh58gljva5"; + version = "0.1.7.0"; + sha256 = "1g5pgwkw1kqfskk131v2vaqcvyxqgslff62qamjz4dzray9fa9cp"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -217037,6 +217609,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.2.0.0"; + sha256 = "08jw6acvi016lxkw6rzxfxfcx56nwfi6ka52flkq2ks8038y3syy"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-uuid" = callPackage ({ mkDerivation, base, uuid, validity }: mkDerivation { @@ -217049,6 +217636,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-uuid_0_1_0_0" = callPackage + ({ mkDerivation, base, uuid, validity }: + mkDerivation { + pname = "validity-uuid"; + version = "0.1.0.0"; + sha256 = "129h7cjgixq6l29n3y66zcx5ynfnxz3prqkgf2028f6w4mhd0154"; + libraryHaskellDepends = [ base uuid validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for uuid"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-vector" = callPackage ({ mkDerivation, base, hashable, validity, vector }: mkDerivation { @@ -217061,6 +217661,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.2.0.0"; + sha256 = "0kyyrcwxial9csyx40vrl0frz5yrmzqhjpy1cz8afsc7r4ph12yi"; + libraryHaskellDepends = [ base hashable validity vector ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -221612,17 +222225,17 @@ self: { ({ mkDerivation, aeson, async, base, basement, bytestring, cereal , cryptonite, data-default, exceptions, generics-sop, hspec , hspec-contrib, hspec-discover, hspec-expectations, http-client - , http-client-tls, machines, memory, mtl, parsec, split, stm - , tagged, template-haskell, text, time, transformers + , machines, memory, mtl, parsec, split, stm, tagged + , template-haskell, text, time, transformers }: mkDerivation { pname = "web3"; - version = "0.7.0.0"; - sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h"; + version = "0.7.1.0"; + sha256 = "0ckxnnp5aqcd13p5gnk1nx7ysws6x7nmfklxqllilpzdh5ibyj59"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop http-client http-client-tls machines memory - mtl parsec tagged template-haskell text transformers + exceptions generics-sop http-client machines memory mtl parsec + tagged template-haskell text transformers ]; testHaskellDepends = [ async base bytestring data-default generics-sop hspec hspec-contrib @@ -222258,8 +222871,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.3"; - sha256 = "14hmxg7p2mq3lh7ydmjk22xr95hd37q3c95d3k6rqi2jxhjs1gvp"; + version = "1.0.4"; + sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -229475,6 +230088,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_4" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.4"; + sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -229500,8 +230141,8 @@ self: { }: mkDerivation { pname = "yesod-text-markdown"; - version = "0.1.8"; - sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81"; + version = "0.1.10"; + sha256 = "1p3xcghlazxdqwgs4d1gsbmpjpmhmx8dcxjhha5hxww4ilyqpviw"; libraryHaskellDepends = [ aeson base markdown persistent shakespeare text yesod-core yesod-form yesod-persistent @@ -230836,8 +231477,8 @@ self: { }: mkDerivation { pname = "zeromq4-patterns"; - version = "0.3.0.0"; - sha256 = "0y5rk13rzmyfxrxbkn38klzxgnbmqi2xg69m5l2gb2gqrza8szy7"; + version = "0.3.1.0"; + sha256 = "1n9yndiw0z2asslkx2nlx56w3qhb55p7ih03j52889m2f8maiwvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 0ab102a5ec43..18aeef04a770 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.33"; + version = "1.4.40"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0fl4m3vsycd35gkrrlqsjlv0myh12bgb0jg3pm548l19qwrc0pm7"; + sha256 = "16n5p29pf062mfsn7q8q8hw0ppxb02a0kkakd0vjrybqflpgf42j"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index dec08d17177d..890f37897610 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.3"; + baseVersion = "2.6"; revision = "0"; - sha256 = "0z6lwv28hxnfkhd4s03cb4cdm1621bsswc2h88z4qslqwpz71y9r"; + sha256 = "1iawmymmnp5j2mcjj70slivn6bgg8gbpppldc1rjqw5sbdan3wn1"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index d2dc9a8c637b..403f0e8aa995 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -9,7 +9,6 @@ with stdenv.lib; -assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU || hostPlatform.isCygwin; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix deleted file mode 100644 index 940882b1742d..000000000000 --- a/pkgs/development/libraries/godot_headers/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "godot_headers"; - version = "2018-02-09"; - src = fetchFromGitHub { - owner = "GodotNativeTools"; - repo = "godot_headers"; - rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae"; - sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh"; - }; - buildPhase = "true"; - installPhase = '' - mkdir $out - cp -r . $out/include - ''; - meta = { - homepage = "https://github.com/GodotNativeTools/godot_headers/"; - description = "Headers for the Godot API supplied by the GDNative module"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.twey ]; - }; -} diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6b370f46e70d..6244c3a351e7 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "01lyikbpqky1ib8g4vhwpb5rjwyzm6g1z24z8m73lk4vcdl65190"; + sha256 = "16rmzxhhmbvhp4q6qac5j9c74z2pcg5raag5w16mynzikdd2l05b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 3c900f86917e..6c52f2c0b1a6 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu -, cppunit, zlib +, cppunit, zlib, liblangtag }: let s = # Generated upstream information rec { baseName="libe-book"; - version="0.1.2"; + version="0.1.3"; name="${baseName}-${version}"; - hash="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; - url="mirror://sourceforge/project/libebook/libe-book-0.1.2/libe-book-0.1.2.tar.xz"; - sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; + hash="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; + url="https://kent.dl.sourceforge.net/project/libebook/libe-book-0.1.3/libe-book-0.1.3.tar.xz"; + sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gperf librevenge libxml2 boost icu cppunit zlib + gperf librevenge libxml2 boost icu cppunit zlib liblangtag ]; # Boost 1.59 compatability fix diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix new file mode 100644 index 000000000000..6d9085e1741b --- /dev/null +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -0,0 +1,52 @@ +{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext +, pkgconfig, glib, libxml2, gobjectIntrospection, gnome-common, unzip +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "liblangtag"; + version = "0.6.1"; + + src = fetchFromBitbucket { + owner = "tagoh"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g"; + }; + + core_zip = fetchurl { + # please update if an update is available + url = "http://www.unicode.org/Public/cldr/33/core.zip"; + sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s"; + }; + + language_subtag_registry = fetchurl { + url = "http://www.iana.org/assignments/language-subtag-registry"; + sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b"; + }; + + postPatch = '' + gtkdocize + cp "${core_zip}" data/core.zip + touch data/stamp-core-zip + cp "${language_subtag_registry}" data/language-subtag-registry + ''; + + configureFlags = [ + ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias'' + ]; + + buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common + unzip ]; + nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ]; + + meta = { + inherit version; + description = "An interface library to access tags for identifying languages"; + license = stdenv.lib.licenses.mpl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + # There are links to a homepage that are broken by a BitBucket change + homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; + }; +} diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 3afe0e905e74..8168ff0edae4 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1lfdq2ahskf9yd0m71jlx3r4n6a0dhg4wxpnwbrvj2a23k7db7zi"; + sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 00ec22986179..335400b80efc 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,39 @@ -args@{ callPackage, ... }: +{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: -callPackage (import ./generic.nix { - version = "1.1.6"; - sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7"; -}) args +stdenv.mkDerivation rec { + name = "libtorrent-rasterbar-${version}"; + version = "1.1.7"; + + src = + let formattedVersion = lib.replaceChars ["."] ["_"] version; + in fetchurl { + url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; + sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; + }; + + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = [ boost openssl zlib python libiconv geoip ]; + + preConfigure = "./autotool.sh"; + + configureFlags = [ + "--enable-python-binding" + "--with-libgeoip=system" + "--with-libiconv=yes" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.out}/lib" + "--with-libiconv=yes" + ]; + + enableParallelBuilding = true; + + doCheck = false; # fails to link + + meta = with stdenv.lib; { + homepage = http://www.rasterbar.com/products/libtorrent/; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix deleted file mode 100644 index c112ab65a20d..000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Version specific options -{ version, sha256, patches ? [] }: - -{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: - -let formattedVersion = lib.replaceChars ["."] ["_"] version; - -in - -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; - - src = fetchurl { - url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; - inherit sha256; - }; - - inherit patches; - - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ boost openssl zlib python libiconv geoip ]; - - preConfigure = "./autotool.sh"; - - configureFlags = [ - "--enable-python-binding" - "--with-libgeoip=system" - "--with-libiconv=yes" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - "--with-libiconv=yes" - ]; - - enableParallelBuilding = true; - - doCheck = false; # fails to link - - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; - description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; - license = licenses.bsd3; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index fc2068ca02ca..4265f1ee98a3 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "14pdih09h3bmgimmj9sa917x7kld49m91gvh0lcncink8rmbxvf1"; + sha256 = "1702abnsaf473c56pz18xjgvc2pjhba8dyfryir5dg34zw1c94sc"; }; buildInputs = [ diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix deleted file mode 100644 index c82a543413e2..000000000000 --- a/pkgs/development/libraries/poppler/qt4.nix +++ /dev/null @@ -1,44 +0,0 @@ -# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883) -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty -, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg -, poppler_data, qt4 -}: - -let - # Last version supporting QT4 - version = "0.61.1"; -in -stdenv.mkDerivation rec { - name = "poppler-qt4-${version}"; - - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty; - - propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ]; - - nativeBuildInputs = [ cmake ninja pkgconfig ]; - - cmakeFlags = [ - "-DENABLE_XPDF_HEADERS=on" - "-DENABLE_UTILS=off" - ]; - - meta = with lib; { - homepage = https://poppler.freedesktop.org/; - description = "A PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 281dbe0a5eda..bc3b44413054 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,13 +10,13 @@ let xcodePatch = in stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.10.3"; + version = "2.9.4"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; - sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; + sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; }; buildInputs = [ (if withQt5 then qtbase else qt4) ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); - patches = [] ++ lib.optional withQt5 [ xcodePatch ]; + patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index fb43af362433..0f727a9be476 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 ="1dvhs9nkznlnagzjny61fh574g42c47b9s5hxsqdgqb51njawdg1"; + sha256 ="1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik"; }; buildInputs = [ glib systemd libgudev ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index e7a2dee541d0..5f8e2442726c 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -45,7 +45,7 @@ passthru = { fancyName = "MariaDB"; - driver = "lib/libmyodbc3-3.51.12.so"; + driver = "lib/libmaodbc.so"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index cc6e7211b1d2..b9b18dc79103 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin mkdir -p $out/lib $out/share/vulkan/explicit_layer.d - cp -d layers/*.so $out/lib/ - cp -d layers/*.json $out/share/vulkan/explicit_layer.d/ + cp -L layers/*.so $out/lib/ + cp -L layers/*.json $out/share/vulkan/explicit_layer.d/ sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 81ec5732b9a2..2fe4005532d4 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -3,8 +3,6 @@ , platformTools }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "android-ndk-r10e"; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 271a18e4ee06..3b5da19da9e1 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -3,8 +3,6 @@ , platformTools }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "android-ndk-r8e"; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index be4fc0f7f545..601b0b319bc8 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,7 +1,5 @@ { stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: -assert stdenv.system == "i686-linux"; - # TODO: # # The FlashTool and FlashToolConsole scripts are messy and should probably we @@ -57,7 +55,7 @@ stdenv.mkDerivation rec { homepage = http://www.flashtool.net/; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; license = stdenv.lib.licenses.unfreeRedistributableFirmware; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ce5bb315581d..2029eabba026 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -17,9 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - # all tests with flake8 are broken right now - # https://github.com/tholo/pytest-flake8/issues/45 - doCheck = false; + doCheck = !stdenv.isDarwin; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index b6f94536e2fa..cb7635522621 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.4"; + version = "0.6.5"; name = "${pname}-${version}"; # Tests aren't included in PyPI tarball. @@ -10,7 +10,7 @@ buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "0mikgksf01w82wnnm0phmzkijk2c93g24fzd59s71n3zy7f7dx3l"; + sha256 = "0b7jw07s4mnp20gcg8raw4bhw2h1hxf75cbn4f2ynj69fbpfr38h"; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 50cb8ceba913..331366e379dd 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,7 +6,7 @@ let pname = "PyQt"; - version = "5.10"; + version = "5.10.1"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; @@ -25,7 +25,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; + sha256 = "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 74ff0be3833a..1bc08d634189 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20170302"; + version = "20180427"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff"; - sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx"; + rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7"; + sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index b170f480e96e..c2d205f2833c 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.0"; + version = "1.0.1"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01driw4sc6nfi3m3ii7d074pxi3h1h4mbiyad9crg5i1l5jxx5ir"; + sha256 = "0s5fdivrmhjf6ybr6m2qb1h8hndv2jh2ir29qv36lhy9b7sc9kg5"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 2d2b3af0694f..fac0780982db 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { url = "https://github.com/errbotio/rocket/pull/1.patch"; - sha256 = "0v9zjp4ls32vkpr4b6kjflz4ny2fwj6hwshbnjmhdzc4hnmnzf7x"; + sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; meta = { diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 65211ca088b4..91caf0348a4e 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4"; + sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 98adaf1c1aa1..ae540104df3a 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -76,6 +76,9 @@ let ./skip_test_linux_distro.patch ]; + # TimeoutErrors on slow machines -> aarch64 + doCheck = !stdenv.isAarch64; + postPatch = '' substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6cce9803c915..c834e6aacde1 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.6.0"; + version = "10.7.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6"; + sha256 = "0vvi9czvl9ina3hrfd5qb557wyyspndagbzrjzmv0bbjspxgb4c5"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9"; + sha256 = "1vb85asz5y9x7zzambvdfcy05nyr4kryx5zsfz7nbna7hidi2s86"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz"; + sha256 = "0v4c2631yzizhbiym3qzl8p4vjy5a081ry66qpl21ma9ib2cm9r5"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index df9addcad3cb..2c1b942169fe 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb"; + sha256 = "0my5rh553yfb8lz1lv5gmgvqbc5pl4xjii4z5wwbbpniyxwy64q4"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index da8f90cd9406..470ba291825a 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "2018-04-28"; # ~= 1.0.2, but no release tags yet + version = "1.2.0"; goPackagePath = "github.com/SRI-CSL/gllvm"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e"; - sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl"; + rev = "v${version}"; + sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 89cc7eb1bfee..88ea499d28cf 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -34,27 +34,29 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildPhase = '' - scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \ + scons target=release_debug platform=x11 prefix=$out -j $NIX_BUILD_CORES \ ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} ''; + outputs = [ "out" "dev" "man" ]; + installPhase = '' - mkdir -p $out/bin - cp bin/godot.x11.tools.* $out/bin/godot + mkdir -p "$out/bin" + cp bin/godot.* $out/bin/godot - mkdir -p "$out/share/applications" + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + + mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps} cp misc/dist/linux/godot.desktop "$out/share/applications/" - substituteInPlace "$out/share/applications/godot.desktop" \ - --replace "Exec=godot" \ - "Exec=$out/bin/godot" - - mkdir -p "$out/share/icons/hicolor/scalable/apps/" cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" cp icon.png "$out/share/icons/godot.png" - - mkdir -p "$out/share/man/man6" - cp misc/dist/linux/godot.6 "$out/share/man/man6/" + substituteInPlace "$out/share/applications/godot.desktop" \ + --replace "Exec=godot" "Exec=$out/bin/godot" ''; meta = { diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index c434fd5a7dec..e71e296212cd 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index 025dfc56721d..af738bc71a93 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { stdenv, requireFile, patchelf, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 2eeefb23e042..2a707e35b918 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.4.1"; name = "visualvm-${version}"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z"; + sha256 = "10ciyggf8mcy3c53shpl03fxqwsa2ilgw3xdgqhb1ah151k18p78"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 09220b2dc651..bf9797671269 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e"; - sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg"; + rev = "34b357bc5e873d52d2aa41287c6e138244cea109"; + sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-03-25"; + version = "2018-05-01"; inherit src; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' pushd ${src} - $out/bin/cquery --ci --clang-sanity-check && \ $out/bin/cquery --ci --test-unit ''; @@ -56,6 +55,5 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.tobim ]; - priority = 3; }; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 66fbed514dc5..15eac37a53a9 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -10,10 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ elfutils libunwind ]; - preConfigure = - '' - configureFlags="--disable-werror" - makeFlagsArray=(INSTALL="install -c") + prePatch = let + debian = fetchurl { + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz; + sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp"; + }; + in '' + tar xf '${debian}' + patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index de2d6c5b7bfd..a8183aa4ba08 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -21,8 +21,6 @@ let in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.10"; @@ -93,7 +91,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 8b6b655b6a56..51a83760be39 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,6 @@ let platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; in -assert lib.elem stdenv.system platforms; stdenv.mkDerivation rec { name = "phantomjs-1.9.8"; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index b3049736b710..041aee7a1c5c 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.10.3"; + version="1.0.0"; name="${baseName}-${version}"; owner = "laurentj"; repo = "${baseName}"; - sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y"; + sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4"; rev = "${version}"; }; buildInputs = [ diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index f7628cf181c5..d1b1c84a3136 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, freetds, readline }: +{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: let mainVersion = "2.5"; @@ -17,11 +17,13 @@ in stdenv.mkDerivation rec { substituteInPlace src/cmd_connect.c \ --replace CS_TDS_80 CS_TDS_73 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "libct.so" "libct.dylib" ''; enableParallelBuilding = true; - buildInputs = [ freetds readline ]; + buildInputs = [ freetds readline libiconv ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 9a4aaaad3ced..4e5596fee661 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,12 +1,9 @@ -{ stdenv, lib, makeWrapper, fetchurl, dpkg, - - alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk2-x11, - nspr, nss, - - libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, - libXrender, libXtst, libxcb, - - libudev0-shim, glibc, curl, openssl +{ stdenv, lib, makeWrapper, fetchurl, dpkg +, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype +, gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss +, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 +, libudev0-shim, glibc, curl, openssl }: let @@ -15,14 +12,14 @@ let gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.0"; + version = "5.16.1"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1cpw63ibxaa08vms7fbxr5ap2yh4vcl8q3rjfn0ag1zkimz8cg2p"; + sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index fd575975fed5..9766e58c15ae 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio , xorg }: -assert stdenv.system == "x86_64-linux"; let inherit (xorg) libXext libX11; @@ -58,5 +57,3 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; }; } - - diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 947e52e1f13d..fa498b8e0411 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - stdenv.mkDerivation rec { version = "0.151.u0-1"; name = "sdlmame-${version}"; @@ -39,6 +37,6 @@ stdenv.mkDerivation rec { description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support"; license = "MAME"; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 30e2bcfdf524..ce8d38ca5d1d 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20180409.d95f476"; + version = "20180429.31384ca"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "1psml0abh3i577dns440h52568ggdny2wk1hhr30815nxibbribx"; + sha256 = "0r97kyy0rxgzw78lby2kwi8fg1yimw8a3biy5psgd983d0nwcf9l"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 1c145f6d71c0..65dc77fbf16f 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, file, fetchurl, unzip }: -assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://terraria.org; description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; - platforms = platforms.linux; + platforms = ["x86_64-linux"]; license = licenses.unfree; }; } diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index e5bb211eb227..e0f9bae2e39b 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: with stdenv.lib; -assert stdenv.isi686; stdenv.mkDerivation { name = "tibia-10.90"; diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 4bac1cd1bb35..0bdb759048ad 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, unzip, patchelf, xorg, openal }: -assert stdenv.isLinux; -assert stdenv.isx86_64; - let buildDemo = { name, src }: stdenv.mkDerivation rec { @@ -47,7 +44,7 @@ let meta = { description = "Unreal Engine 4 Linux demos"; homepage = https://wiki.unrealengine.com/Linux_Demos; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; }; }; @@ -189,4 +186,3 @@ in { }; }; } - diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index c9cd7119d8f2..81ffd6b135fc 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.13"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; + sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index ac3e96e26589..021852f3505c 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, rpm, cpio, zlib }: -assert stdenv.system == "x86_64-linux"; - /* usage: (sorry, its still impure but works!) impure directory: @@ -23,7 +21,7 @@ sed -n 's/^ServerBin //p' $(sed -n 's/respawn.*-c \(.*''\) -F.*''/\1/p' /etc/eve then. I've tried that. TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc - + */ stdenv.mkDerivation { @@ -56,13 +54,13 @@ stdenv.mkDerivation { patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath $p done - + mkdir $out/lib ln -s $out/cups/lib $out/lib/cups ''; meta = { description = "Some additional CUPS drivers including Canon drivers"; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 673e4c3ed087..2e28fd297ec0 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -2,8 +2,6 @@ , makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv , wxGTK30, zlib }: -assert stdenv.isi686; - stdenv.mkDerivation rec { name = "pcsx2-${version}"; version = "1.4.0"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db58c398526a..0b71797eeec8 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -6,7 +6,6 @@ buildScript ? null, configureFlags ? "" }: -assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; with import ./util.nix { inherit lib; }; @@ -83,7 +82,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { # Add capability to ignore known failing tests # and enable doCheck doCheck = false; - + postInstall = let links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}"; in '' @@ -100,7 +99,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { fi done ''; - + enableParallelBuilding = true; # https://bugs.winehq.org/show_bug.cgi?id=43530 diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index aaa932c0a1c4..1aae47e603b5 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl}: -assert stdenv.system == "i686-linux"; - stdenv.mkDerivation { name = "folding-at-home-6.02"; @@ -22,7 +20,7 @@ stdenv.mkDerivation { # be considered a gcroot. installPhase = '' BINFILES="fah6 mpiexec"; - for a in $BINFILES; do + for a in $BINFILES; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a done mkdir -p $out/bin @@ -33,5 +31,6 @@ stdenv.mkDerivation { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; license = stdenv.lib.licenses.unfree; + platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0134d5fae48a..163a1a986760 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -21,7 +21,9 @@ in # TL;DR # Add your plugin to ./vim-plugin-names # Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"` -# Copy the generated expression(s) into this file. +# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, +# update ./vim-plugin-names to contain only plugins which need generation +# Copy the generated expression(s) into this file from the ./result file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code # This attrs contains two sections: diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 188d9709ee08..b4fb99504ef2 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,5 @@ { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils -, yacc, flex, libressl, bash, more }: +, yacc, flex, libressl, bash, less, writeText }: let fetchNetBSD = path: version: sha256: fetchcvs { @@ -30,13 +30,16 @@ let NOGCCERROR = "yes"; LEX = "flex"; MKUNPRIVED = "yes"; - INSTPRIV = '' ''${INSTPRIV.unpriv}''; HOST_SH = "${bash}/bin/sh"; OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - PRESERVE = "-p"; MACHINE_ARCH = hostPlatform.parsed.cpu.name; MACHINE_CPU = hostPlatform.parsed.cpu.name; + INSTALL_FILE = "install -U -c"; + INSTALL_DIR = "xinstall -U -d"; + INSTALL_LINK = "install -U -l h"; + INSTALL_SYMLINK = "install -U -l s"; + # libs will be provided by cc-wrapper LIBCRT0 = ""; LIBCRTI = ""; @@ -106,17 +109,6 @@ let fi ''; - # Need to create directories for xinstall to work. Unused ones - # will be removed in the postInstall. - preInstall = '' - mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR $out$INCSDIR - for i in 1 2 3 4 5 6 7 8 9; do - mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ - $out$DOCDIR/reference/ref$i - done - ''; - preFixup = '' # Remove lingering /usr references if [ -d $out/usr ]; then @@ -125,10 +117,6 @@ let find . -type f -exec mv \{} $out/\{} \; fi - if [ -f $out/METALOG ]; then - rm $out/METALOG - fi - find $out -type d -empty -delete ''; @@ -155,11 +143,11 @@ let ${make.postPatch} ''; buildPhase = '' - runHook prePatch + runHook preBuild sh ./buildmake.sh - runHook postPatch + runHook postBuild ''; installPhase = '' runHook preInstall @@ -229,7 +217,14 @@ let ] ++ libutil.extraPaths ++ libc.extraPaths; }; - install = netBSDDerivation { + # HACK to ensure parent directories exist. This emulates GNU + # install’s -D option. No alternative seems to exist in BSD install. + install = let binstall = writeText "binstall" '' + #!/usr/bin/env sh + for last in $@; do true; done + mkdir -p $(dirname $last) + xinstall "$@" + ''; in netBSDDerivation { path = "usr.bin/xinstall"; version = "7.1.2"; sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; @@ -240,13 +235,12 @@ let runHook preInstall install -D install.1 $out/share/man/man1/install.1 - install -D xinstall $out/bin/install - ln -s $out/bin/install $out/bin/xinstall - ln -s $out/bin/install $out/bin/binstall + install -D xinstall $out/bin/xinstall + install -D -m 0550 ${binstall} $out/bin/binstall + ln -s $out/bin/binstall $out/bin/install runHook postInstall ''; - # INSTALL_FILE = "install -D"; }; fts = netBSDDerivation { @@ -332,6 +326,8 @@ let substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ --replace '-Wl,-rpath,''${SHLIBDIR}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" \ @@ -344,10 +340,6 @@ let --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ --replace '-Wl,-rpath,''${SHLIBDIR}' "" ''; - preInstall = '' - mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \ - $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk - ''; postInstall = '' (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; @@ -402,7 +394,6 @@ in rec { version = "7.1.2"; sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; makeFlags = [ "BINDIR=/share" ]; - preInstall = "mkdir -p $out/share/dict"; }; games = netBSDDerivation { @@ -410,20 +401,20 @@ in rec { sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; version = "7.1.2"; makeFlags = [ "BINDIR=/bin" - "SCRIPTSDIR=/bin" - "FILESDIR=/share/games" ]; + "SCRIPTSDIR=/bin" ]; postPatch = '' sed -i '1i #include ' adventure/save.c for f in $(find . -name pathnames.h); do substituteInPlace $f \ - --replace /usr/share/games/fortune $out/share/games \ --replace /usr/share/games $out/share/games \ --replace /usr/games $out/bin \ --replace /usr/libexec $out/libexec \ - --replace /usr/bin/more ${more}/bin/more \ + --replace /usr/bin/more ${less}/bin/less \ --replace /usr/share/dict ${dict}/share/dict done + substituteInPlace boggle/boggle/bog.h \ + --replace /usr/share/games $out/share/games substituteInPlace ching/ching/ching.sh \ --replace /usr/share $out/share \ --replace /usr/libexec $out/libexec @@ -457,11 +448,15 @@ in rec { # HACK strfile needs to be installed first & in the path. The # Makefile should do this for us but haven't gotten it to work preBuild = '' - mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 (cd fortune/strfile && make && make BINDIR=/bin install) export PATH=$out/bin:$PATH ''; + postInstall = '' + substituteInPlace $out/usr/share/games/quiz.db/index \ + --replace /usr $out + ''; + NIX_CFLAGS_COMPILE = [ "-D__noinline=" "-D__scanflike(a,b)=" @@ -475,14 +470,6 @@ in rec { "-D__c99inline=__inline" ]; - preInstall = '' - mkdir -p $out/var/games/hackdir \ - $out/share/games \ - $out$DOCDIR/reference/ref6/rogue \ - $out$MANDIR/man6 $out$MANDIR/html6 - touch $out/var/games/hackdir/perm - ''; - buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ dict.src who.src ]; }; @@ -543,7 +530,6 @@ in rec { substituteInPlace term.c --replace /usr/share $out/share ''; postInstall = '' - mkdir -p $out/share/misc (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ @@ -593,4 +579,11 @@ in rec { ]; }; + misc = netBSDDerivation { + path = "share/misc"; + version = "7.1.2"; + sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665"; + makeFlags = [ "BINDIR=/share" ]; + }; + } diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix index 5b9f30b62c39..f336b14ee37b 100644 --- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix +++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix @@ -13,7 +13,7 @@ let minSdkVersion = "9.0"; iosPlatformArch = { parsed, ... }: { - "arm" = "armv7"; + "armv7a" = "armv7"; "aarch64" = "arm64"; "x86_64" = "x86_64"; }.${parsed.cpu.name}; diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix index 3844912f6ba3..fa3d4284e597 100644 --- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -1,7 +1,5 @@ { stdenv, writeScript }: -assert stdenv.isDarwin; - stdenv.mkDerivation rec { name = "darwin-native-x11-and-opengl"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index e2340939fce7..b8498c096d33 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2" "http://alsa.cybermirror.org/utils/${name}.tar.bz2" ]; - sha256 = "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj"; + sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index ab1a93b3a703..275600d42785 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -2,7 +2,6 @@ # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x -assert stdenv.isLinux; assert builtins.compareVersions "3.18" kernel.version == 1; stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index d4595d73d942..bbf01e5027c3 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -2,8 +2,6 @@ pythonPackages, readline, udev, libical, systemd, enableWiimote ? false, enableMidi ? false }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "bluez-5.49"; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 65be409a75e3..e36aaa5e38d0 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, libtool, gettext }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "cpufrequtils-008"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 971eef6a8b52..8d18d5980207 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, flex, systemd, perl }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "drbd-8.4.4"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 177a5c878f65..f798a3a85e59 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.38"; + version = "4.14.39"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg"; + sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 46bdcff66a10..acafd0bd89f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.6"; + version = "4.16.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs"; + sha256 = "0f81mxc5b3zf5m29bwc3afv07k60661zl18098cjjqv6qpvbwynq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ccc8b4ba2dc2..725f3385a80c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.130"; + version = "4.4.131"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj"; + sha256 = "02f7sx20l0ljkgffac0yqav1kk7x1gl6026icslcsnn46pfpl4k5"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cc4609676d4e..b09a58c6eb79 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.97"; + version = "4.9.98"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4"; + sha256 = "1vqh33wdiqf3j4xfakxndhb8x6yr5ppwv9asx7kldjfvb8sr1k8j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix index 4d5cd07cd95c..a1c93e565905 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.38"; + version = "4.14.39"; revision = "a"; - sha256 = "0cad9fp1h96blbgqlgxyv8wc0jg88mildc1ayljz0zpa5dxdfzh4"; + sha256 = "19nx537a8kbbyp5d67anrqfw8i8hliw3yb1gyrf70isl3fqifjaa"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix index a931d81cf265..9d4b729060ae 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.16.6"; + version = "4.16.7"; revision = "a"; - sha256 = "0lkycpb837svrvyy04a8n2ix1rrzfl87ah5293mgf9jgy4kmaa2l"; + sha256 = "1kdy3sqrn161hm5avhk3nd75p07a21ja0rzar3ybibh1bl2mc6zq"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index f00d6272902d..8248a628f0ac 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }: -assert pam != null -> stdenv.isLinux; +{ stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { name = "libcap-${version}"; @@ -10,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39"; }; - outputs = [ "out" "dev" "lib" "man" "doc" ] - ++ stdenv.lib.optional (pam != null) "pam"; + outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "lib=lib" - (stdenv.lib.optional (pam != null) "PAM_CAP=yes") + "PAM_CAP=yes" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" ]; diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 833c032ccd2c..084a7e7c9a3b 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl }: -assert stdenv.isLinux; - stdenv.mkDerivation { name = "lsscsi-0.28"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 7a59c2ea7573..b6fdae75bac2 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -3,8 +3,6 @@ , buildPlatform, hostPlatform }: -assert stdenv.isLinux; - let sendmail-script = writeScript "sendmail-script" '' #!/bin/sh diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index e2abbd7335ee..72095bc8cdab 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -5,9 +5,6 @@ with stdenv.lib; # The Magewell Pro Capture drivers are not supported for kernels older than 3.2 assert versionAtLeast kernel.version "3.2.0"; -# this package currently only supports x86 and x86_64, as I have no ARM device to test on -assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); - let bits = if stdenv.is64bit then "64" diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index cc6ac64d58ad..68acbb83531e 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, kernel, which }: -assert stdenv.isLinux; # Don't bother with older versions, though some might even work: assert stdenv.lib.versionAtLeast kernel.version "4.10"; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index edc7220d6586..358fa700382f 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl, ncurses}: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "psmisc-23.1"; diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index f69269347e37..d02a531f67fc 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -1,7 +1,5 @@ { stdenv, systemd, cryptsetup }: -assert stdenv.isLinux; - stdenv.lib.overrideDerivation systemd (p: { version = p.version; name = "systemd-cryptsetup-generator"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index ad8f5fb08e0c..1c5dd6dadf1b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,8 +13,6 @@ , withSelinux ? false, libselinux }: -assert stdenv.isLinux; - let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 180aabc94cc6..ed3567ffdad3 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null, extraConfig ? ""}: -assert stdenv.isLinux; assert cross != null -> gccCross != null; let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d62038c7b0b0..1e9101b68afe 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -3,8 +3,6 @@ , useSystemd ? true, systemd, gobjectIntrospection }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "upower-0.99.7"; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index e1bafa93ea6f..527471bad328 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -11,8 +11,6 @@ , libpciaccess }: -assert stdenv.isLinux; - stdenv.mkDerivation { name = "xf86-input-multitouch-20110312"; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 95326b4c1c6c..b1745dd53716 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,12 +1,91 @@ { stdenv, fetchurl, fetchFromGitHub -, which, findutils, m4, gawk, python, openjdk, mono58, libressl_2_6 +, which, findutils, m4, gawk +, python, openjdk, mono58, libressl_2_6 +, boost16x }: let - version = "5.1.7"; - branch = "release-5.1"; - rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; - sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + makeFdb = + { version + , branch + , rev, sha256 + + # fdb 6.0+ support boost 1.6x+, so default to it + , boost ? boost16x + }: stdenv.mkDerivation rec { + name = "foundationdb-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "apple"; + repo = "foundationdb"; + inherit rev sha256; + }; + + nativeBuildInputs = [ gawk which m4 findutils mono58 ]; + buildInputs = [ python openjdk libressl_2_6 boost ]; + + patches = + [ ./fix-scm-version.patch + ./ldflags.patch + ]; + + postPatch = '' + substituteInPlace ./build/scver.mk \ + --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ + --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" + + substituteInPlace ./Makefile \ + --replace 'shell which ccache' 'shell true' \ + --replace -Werror "" + + substituteInPlace ./Makefile \ + --replace libstdc++_pic libstdc++ + + substituteInPlace ./build/link-validate.sh \ + --replace 'exit 1' '#exit 1' + + patchShebangs . + ''; + + enableParallelBuilding = true; + makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; + + configurePhase = ":"; + installPhase = '' + mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb + + cp -v ./lib/libfdb_c.so $lib/lib + cp -v ./lib/libfdb_java.so $lib/lib + + cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + + cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb + cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + + cp -v ./bindings/java/foundationdb-client.jar $lib/share/java + + for x in fdbbackup fdbcli fdbserver fdbmonitor; do + cp -v "./bin/$x" $out/bin; + done + + ln -sfv $out/bin/fdbbackup $out/bin/dr_agent + ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore + ln -sfv $out/bin/fdbbackup $out/bin/fdbdr + + ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent + ''; + + outputs = [ "out" "lib" "dev" ]; + + meta = with stdenv.lib; { + description = "Open source, distributed, transactional key-value store"; + homepage = https://www.foundationdb.org; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; + }; # hysterical raisins dictate a version of boost this old. however, # we luckily do not need to build anything, we just need the header @@ -19,81 +98,34 @@ let sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; }; - buildPhase = ":"; configurePhase = ":"; - installPhase = '' - mkdir -p $out/include/ - cp -R boost $out/include/ - ''; + buildPhase = ":"; + installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; }; -in stdenv.mkDerivation rec { - name = "foundationdb-${version}"; - inherit version; +in with builtins; { - src = fetchFromGitHub { - owner = "apple"; - repo = "foundationdb"; - inherit rev sha256; + foundationdb51 = makeFdb { + version = "5.1.7"; + branch = "release-5.1"; + rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; + sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + boost = boost152; }; - nativeBuildInputs = [ gawk which m4 findutils boost152 mono58 ]; - buildInputs = [ python openjdk libressl_2_6 ]; - - patches = - [ ./fix-scm-version.patch - ./ldflags.patch - ]; - - postPatch = '' - substituteInPlace ./build/scver.mk \ - --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ - --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" - - substituteInPlace ./Makefile \ - --replace 'shell which ccache' 'shell true' \ - --replace -Werror "" - - substituteInPlace ./Makefile \ - --replace libstdc++_pic libstdc++ - - substituteInPlace ./build/link-validate.sh \ - --replace 'exit 1' '#exit 1' - - patchShebangs . - ''; - - enableParallelBuilding = true; - makeFlags = [ "all" "fdb_c" "KVRELEASE=1" ]; - - configurePhase = ":"; - installPhase = '' - mkdir -vp $out/{bin,libexec/plugins} $lib/lib $dev/include/foundationdb - - cp -v ./lib/libfdb_c.so $lib/lib - cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so - - cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb - cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb - - for x in fdbbackup fdbcli fdbserver fdbmonitor; do - cp -v "./bin/$x" $out/bin; - done - - ln -sfv $out/bin/fdbbackup $out/bin/dr_agent - ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore - ln -sfv $out/bin/fdbbackup $out/bin/fdbdr - - ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent - ''; - - outputs = [ "out" "lib" "dev" ]; - - meta = with stdenv.lib; { - description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + foundationdb52 = makeFdb rec { + version = "5.2.0pre1488_${substring 0 8 rev}"; + branch = "master"; + rev = "18f345487ed8d90a5c170d813349fa625cf05b4e"; + sha256 = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc"; + boost = boost152; }; + + foundationdb60 = makeFdb rec { + version = "6.0.0pre1636_${substring 0 8 rev}"; + branch = "master"; + rev = "1265a7b6d5e632dd562b3012e70f0727979806bd"; + sha256 = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf"; + }; + } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c2f06cd6a8e3..3e95b41fb7e8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.68.0"; + version = "0.68.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -299,7 +299,6 @@ "sensor.dsmr" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; - "sensor.eliqonline" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; "sensor.fastdotcom" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0751ffb3c9ed..a8091c70dfdf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.68.0"; + hassVersion = "0.68.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "037gc2sghg5n0li087vvjcf6657rd31wv0m5r23b2cdfds8lxk4w"; + sha256 = "103py7hfdanr8zk3cl93rm7ngjz0n95kwjbphq7iy8l8hqpzs1m8"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 2bfe03295958..71cb6fc72ab9 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.9"; - sha256 = "0hpsyxpxj89p5vrzv9p1hp7xjbnj5c1w6fdy626ycvsiay4a3bjz"; + version = "1.13.12"; + sha256 = "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 7bd74c3a3325..1b61cb87c9af 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.12.2"; - sha256 = "05h4rwja7170z0l979yjghy9i9ichllwhicylzpmmyyml6fkfprh"; + version = "1.14.0"; + sha256 = "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax"; }) diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix new file mode 100644 index 000000000000..3858720bed5c --- /dev/null +++ b/pkgs/servers/monitoring/facette/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub +, go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }: + +stdenv.mkDerivation rec { + name = "facette-${version}"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "facette"; + repo = "facette"; + rev = "${version}"; + sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257"; + }; + nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; + buildInputs = [ rrdtool ]; + preBuild = '' + export HOME="$NIX_BUILD_ROOT" # npm needs a writable home + ''; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Time series data visualization software"; + longDescription = '' + Facette is a web application to display time series data from various + sources — such as collectd, Graphite, InfluxDB or KairosDB — on graphs. + ''; + homepage = https://facette.io/; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix new file mode 100644 index 000000000000..13e17d0b0192 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "surfboard_exporter-${version}"; + version = "2.0.0"; + + goPackagePath = "github.com/ipstatic/surfboard_exporter"; + + src = fetchFromGitHub { + rev = version; + owner = "ipstatic"; + repo = "surfboard_exporter"; + sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw"; + }; + + meta = with stdenv.lib; { + description = "Arris Surfboard signal metrics exporter"; + homepage = https://github.com/ipstatic/surfboard_exporter; + license = licenses.mit; + maintainers = with maintainers; [ disassembler ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index b028fcdf37d5..f3d5d121c387 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.5.0"; + version = "3.7.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "08hfn359l9s4lckba9xgghkn32r12gqzjjr5s5hn3fzkbsig7njy"; + sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index d460284ef045..b1003687a04d 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.3.8"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "1464nl2ampfkcd2kh1hmc18hh8ya73mjmxizm6wgl5yvkh56a82x"; + sha256 = "07qz5fv4w00hs31hmx099vlzlv0x5i10b5i4h8r0bkprih8k3vg3"; }; buildInputs = [ diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index 9068ca70cc6e..a50d623acbce 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -1,7 +1,5 @@ { stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }: -assert stdenv.system == "x86_64-linux"; - with stdenv.lib; stdenv.mkDerivation rec { @@ -79,5 +77,6 @@ stdenv.mkDerivation rec { description = "Oracle Database Express Edition"; homepage = http://www.oracle.com/technetwork/products/express-edition/; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index c90684e0fe0d..c382061f1ef6 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zookeeper-${version}"; - version = "3.4.11"; + version = "3.4.12"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "110fs5manyaq6rxbzwzs9x3aqw8d5l4177y9qaj3xhgpr2hniggn"; + sha256 = "1fcljn2741jw1jvjrk5a0xr8rk69wjwrq522wrc5nmjhj0qzk1n6"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 8e15476451a8..3c4c3fabfd10 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.9"; + version = "0.4.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n"; + sha256 = "0m8b9xgbz2nvk1q7m0gqy83gbqa49n062gymhk9x93zhbdh8vwky"; }; installPhase = '' diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 4077c4fb9ecb..3bef66597353 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -6,6 +6,17 @@ extraInputs ? [] }: +let + # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved + tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec { + version = "4.5.3"; + name = "${oldAttrs.pname}-${version}"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; + }; + }); +in python2Packages.buildPythonApplication rec { pname = "salt"; version = "2017.7.4"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index dc5a010ec741..ff6a7af03efe 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.04.18"; + version = "2018.04.24"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0kbval5ckan8vvrlpyz1mkb1ifvr149gxpb7ljbcm890p8hpaxff"; + sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix index 244f7b406731..825e1a0cc072 100644 --- a/pkgs/tools/audio/aucdtect/default.nix +++ b/pkgs/tools/audio/aucdtect/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, lib, rpmextract }: -assert stdenv.isLinux; - with lib; stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix new file mode 100644 index 000000000000..25ec31ea698a --- /dev/null +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, openssl, libbsd }: + +let version = "332.25"; + package_name = "hfsprogs"; in +stdenv.mkDerivation rec { + name = "${package_name}-${version}"; + srcs = [ + (fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz"; + sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; + }) + (fetchurl { + url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; + sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; + }) + ]; + + sourceRoot = "diskdev_cmds-" + version; + patches = [ "../debian/patches/*.patch" ]; + + buildInputs = [ openssl libbsd ]; + makefile = "Makefile.lnx"; + + # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ + installPhase = '' + # Create required package directories + install -m 755 -d "$out/bin" + install -m 755 -d "$out/share/${package_name}" + install -m 755 -d "$out/share/man/man8/" + # Copy executables + install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" + install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" + # Copy shared data + install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata" + # Copy man pages + install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" + install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" + ''; + + meta = { + description = "HFS/HFS+ user space utils"; + license = stdenv.lib.licenses.apsl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 7ff42c4d1f99..9c279f99b005 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, fuse, samba, pkgconfig, glib }: +{ stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { name = "smbnetfs-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2"; - sha256 = "16sikr81ipn8v1a1zrqgnsy2as3zcaxbzkr0bm5vxy012bq0plkd"; + sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse samba glib ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ fuse samba glib attr libsecret ]; meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 77302f3d4a2b..2f7e80dd912c 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: -assert stdenv.isLinux; - let p = if stdenv.is64bit then { arch = "x86_64"; @@ -13,7 +11,7 @@ let gcclib = "${stdenv.cc.cc.lib}/lib"; sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; }; -in +in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; @@ -64,4 +62,3 @@ stdenv.mkDerivation rec { ''; }; } - diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 5341c9840be8..b91c7d2378bb 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,7 +1,5 @@ { stdenv, rpmextract, ncurses5, patchelf, makeWrapper, requireFile, unzip }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "megacli-8.07.07"; @@ -31,5 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 2f69517e4bd2..4312aecaacd6 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl, libusb, makeWrapper}: -assert stdenv.isLinux; - stdenv.mkDerivation { name = "pk2cmd-1.20"; src = fetchurl { diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 77308ecf2ed8..7be2e3fc61d7 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, coreutils -, python3, python3Packages, substituteAll }: - -assert stdenv.isLinux; +{ stdenv, fetchFromGitHub, fetchpatch, python3, python3Packages +, lib, makeWrapper, coreutils }: python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; @@ -16,12 +14,6 @@ python3Packages.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./nix-paths.patch; - df = "${coreutils}/bin/df"; - libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; - }) - # Fix build on Python 3.6. (fetchpatch { url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; @@ -30,10 +22,19 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = with python3Packages; [ nose mock ]; + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + for bin in $out/bin/*; do + wrapProgram $bin \ + --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ + --prefix DYLD_LIBRARY_PATH : ${lib.makeSearchPath "lib" (lib.optional (stdenv.hostPlatform.libc == "glibc") (lib.getDev stdenv.cc.libc))} + done + ''; checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/andreafrancia/trash-cli; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch deleted file mode 100644 index d7b485eec158..000000000000 --- a/pkgs/tools/misc/trash-cli/nix-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 -+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 -@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): - - def mount_points_from_df(): - import subprocess -- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout -+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout - return list(_mount_points_from_df_output(df_output)) - - def _mount_points_from_df_output(df_output): -@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : - ("mnt_freq", c_int), # Dump frequency (in days). - ("mnt_passno", c_int)] # Pass number for `fsck'. - -- if sys.platform == "cygwin": -- libc_name = "cygwin1.dll" -- else: -- libc_name = find_library("c") -- -- if libc_name == None : -- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 -+ libc_name = "@libc@" - - libc = cdll.LoadLibrary(libc_name) - libc.getmntent.restype = POINTER(mntent_struct) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 55c785b06da0..d2e490373da0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { pname = "youtube-dl"; - version = "2018.04.25"; + version = "2018.05.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw"; + sha256 = "1mpyqdyjip5a6nn8lj1kaaab4pj75js6i8qzgap8bmn0k46awb1n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 3dfd136ad060..6fef6a9e7fa9 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); - let # Code with BSD license diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index bbee6546b2f4..0b585d10316c 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -2,8 +2,6 @@ with stdenv.lib; -assert stdenv.isLinux; - let arch = if stdenv.system == "x86_64-linux" then "x64" diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 99e12084ccb5..3a1bba4ce8c1 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "miniupnpd-2.0.20180422"; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index ceac5a58800c..031f32b53626 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null; stdenv.mkDerivation { name = "ssmtp-2.64"; - + src = fetchurl { url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { installFlags = "etcdir=$(out)/etc"; installTargets = [ "install" "install-sendmail" ]; - + buildInputs = stdenv.lib.optional tlsSupport openssl; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix new file mode 100644 index 000000000000..cc93da7f2533 --- /dev/null +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, uget, python3Packages }: + +stdenv.mkDerivation rec { + name = "uget-integrator-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ugetdm"; + repo = "uget-integrator"; + rev = "v${version}"; + sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ uget python3Packages.python ]; + + installPhase = '' + for f in conf/com.ugetdm.{chrome,firefox}.json; do + substituteInPlace $f --replace "/usr" "$out" + done + + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Native messaging host to integrate uGet Download Manager with web browsers"; + homepage = https://github.com/ugetdm/uget-integrator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 38104b8b213d..f27f9af59c68 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -3,15 +3,15 @@ , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig , makeWrapper , makeDesktopItem, python, pythonPackages, lib , libredirect, lsof}: -assert system == "i686-linux" || system == "x86_64-linux"; + let - all_data = (with builtins; fromJSON (readFile ./data.json)); + all_data = builtins.fromJSON (builtins.readFile ./data.json); system_map = { i686-linux = "i386"; x86_64-linux = "amd64"; }; - data = (with builtins; getAttr (getAttr system system_map) all_data); + data = all_data.${system_map.${system} or (throw "Unsupported platform")}; baseUrl = http://repo.sinew.in; @@ -54,7 +54,7 @@ let description = "a well known password manager"; homepage = https://www.enpass.io/; license = lib.licenses.unfree; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" "i686-linux"]; }; buildInputs = [makeWrapper dpkg]; @@ -70,8 +70,8 @@ let cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered} sed \ - -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ - $out/share/applications/enpass.desktop + -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ + $out/share/applications/enpass.desktop for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index bcafefb72c95..0a760807afbc 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.22"; + name = "sudo-1.8.23"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"; + sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"; }; prePatch = '' diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index b28fa7cfd475..70640563aa31 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -2,16 +2,16 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.6.1"; + version = "1.6.3"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf"; + sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi"; }; - buildInputs = - [ ronn ] ++ - (with pythonPackages; [ freezegun pytest pytestcov ]); + buildInputs = [ ronn ]; + + checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ]; propagatedBuildInputs = [ nix @@ -27,11 +27,6 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; - # pytest-flake8 is currently broken - # re-enable after it has been fixed - # https://github.com/NixOS/nixpkgs/issues/39206 - patches = [ ./disable-flake8.patch ]; - postBuild = '' make -C doc ''; diff --git a/pkgs/tools/security/vulnix/disable-flake8.patch b/pkgs/tools/security/vulnix/disable-flake8.patch deleted file mode 100644 index cd165d05ccc1..000000000000 --- a/pkgs/tools/security/vulnix/disable-flake8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index a9e37ce..41b9886 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,5 +1,5 @@ - [tool:pytest] --addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix -+addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix - markers = slow: This is a non-unit test and thus is not run by default. Use ``-m slow`` to run these, or ``-m 1`` to run all tests. - - [aliases] -diff --git a/setup.py b/setup.py -index a9315e5..d14ad59 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,7 +35,6 @@ setup( - 'freezegun>0.3', - 'pytest>=3.2', - 'pytest-cov>=2.5', -- 'pytest-flake8', - 'pytest-runner>=2.11,<3dev', - 'pytest-timeout>=1.2', - 'setuptools_scm>=1.15', diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index ee82af1a4707..1ea574dbe8ea 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - version = "1.99.7"; + version = "1.99.8"; name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "0d318i1i5d7hbj06wmb3xag14x542cv7fpkh5zjf5ccm64nyzir4"; + sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; }; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 54c9bbb14060..b9fcb502124f 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.45"; + version = "4.46"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "18z56rprhpm6y0s7pqs19yf7ilq7n50020qzxdm9yra77ivdr09z"; + sha256 = "0cskiqywiqkw44zdg4q78bjns6jjp1dz5lzdxrhpnpldc6075irw"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 179b4cb1a4c0..e56919acc5d5 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); - stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 0c288ca02ccf..3509eb569b1c 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pdfgrep-${version}"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { url = "https://pdfgrep.org/download/${name}.tar.gz"; - sha256 = "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03"; + sha256 = "13al23c2wlpsha6c1z1h6gh5lxzphsnzpd7b78qj16rq2r46phf9"; }; postPatch = '' diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 2cb723a7b71a..a210a65f431c 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -242,11 +242,21 @@ sub terminateContainer { while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) } } +sub startContainer { + system("systemctl", "start", "container\@$containerName") == 0 + or die "$0: failed to start container\n"; +} + sub stopContainer { system("systemctl", "stop", "container\@$containerName") == 0 or die "$0: failed to stop container\n"; } +sub restartContainer { + stopContainer; + startContainer; +} + # Run a command in the container. sub runInContainer { my @args = @_; @@ -285,9 +295,12 @@ if ($action eq "destroy") { unlink($confFile) or die; } +elsif ($action eq "restart") { + restartContainer; +} + elsif ($action eq "start") { - system("systemctl", "start", "container\@$containerName") == 0 - or die "$0: failed to start container\n"; + startContainer; } elsif ($action eq "stop") { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 024ba944ad4c..35cf1cd79252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2417,6 +2417,13 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; + fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + + inherit (fdbPackages) + foundationdb51 + foundationdb52 + foundationdb60; + foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; @@ -2612,7 +2619,6 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; godot = callPackage ../development/tools/godot {}; - godot_headers = callPackage ../development/libraries/godot_headers {}; goklp = callPackage ../tools/networking/goklp {}; @@ -2905,6 +2911,8 @@ with pkgs; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; + highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { @@ -3459,6 +3467,11 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; + liblangtag = callPackage ../development/libraries/liblangtag { + inherit (gnome2) gtkdoc; + inherit (gnome3) gnome-common; + }; + liblouis = callPackage ../development/libraries/liblouis { }; liboauth = callPackage ../development/libraries/liboauth { }; @@ -4124,8 +4137,6 @@ with pkgs; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; - open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -5304,6 +5315,8 @@ with pkgs; uget = callPackage ../tools/networking/uget { }; + uget-integrator = callPackage ../tools/networking/uget-integrator { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; umlet = callPackage ../tools/misc/umlet { }; @@ -8605,6 +8618,8 @@ with pkgs; CoinMP = callPackage ../development/libraries/CoinMP { }; + cointop = callPackage ../applications/misc/cointop { }; + commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; confuse = callPackage ../development/libraries/confuse { }; @@ -10962,8 +10977,6 @@ with pkgs; suffix = "min"; }; - poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { }; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; @@ -12310,6 +12323,8 @@ with pkgs; exim = callPackage ../servers/mail/exim { }; + facette = callPackage ../servers/monitoring/facette { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -12674,6 +12689,7 @@ with pkgs; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; + prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; @@ -16348,9 +16364,7 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3 = callPackage ../applications/audio/kid3 { - qt = qt4; - }; + kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; kile = libsForQt5.callPackage ../applications/editors/kile { }; @@ -17212,7 +17226,7 @@ with pkgs; gtksharp = gtk-sharp-2_0; }; - plover = callPackage ../applications/misc/plover { }; + plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 48980e48f1d4..937c930ac750 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -64,12 +64,6 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc841 = callPackage ../development/compilers/ghc/8.4.1.nix rec { - bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; @@ -135,11 +129,6 @@ in rec { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc841 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc841; - ghc = bh.compiler.ghc841; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc842 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc842; ghc = bh.compiler.ghc842; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 97424a10160b..41debeefc892 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -267,14 +267,14 @@ let }; luafilesystem = buildLuaPackage rec { - version = "1.6.3"; + version = "1.7.0"; name = "filesystem-${version}"; src = fetchFromGitHub { owner = "keplerproject"; repo = "luafilesystem"; rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}"; - sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; + sha256 = "0fibrasshlgpa71m9wkpjxwmylnxpcf06rpqbaa0qwvqh94nhwby"; }; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6963b3d10964..d789b6814b63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3884,36 +3884,6 @@ in { pomegranate = callPackage ../development/python-modules/pomegranate { }; - poppler-qt4 = buildPythonPackage rec { - name = "poppler-qt4-${version}"; - version = "0.18.1"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-poppler-qt4/" + - "python-poppler-qt4-${version}.tar.gz"; - sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; - }; - - propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; - - preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; - - NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/"; - - meta = { - description = "A Python binding to Poppler-Qt4"; - longDescription = '' - A Python binding to Poppler-Qt4 that aims for completeness - and for being actively maintained. - ''; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ sepi ]; - platforms = platforms.all; - }; - }; - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; @@ -6126,11 +6096,11 @@ in { github3_py = buildPythonPackage rec { name = "github3.py-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/g/github3.py/${name}.tar.gz"; - sha256 = "1g91a8q9w0dalf4y4v0g72zi7vfrxwpx639an28vvys20y5zlvwp"; + sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf"; }; buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers dateutil ];