From aa59151c21c353923b3f003662f17f2210c63c57 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 20:23:24 -0400 Subject: [PATCH 01/63] doc: Adds rule to xmlformat to help keep spacing right. The other definitions broke term, cmdsynopsis and arg tags; spaces inside were removed, making workdsrun-ininstead of keeping them spaced. --- nixos/doc/xmlformat.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf index 50255857b24a..4a565c8465bc 100644 --- a/nixos/doc/xmlformat.conf +++ b/nixos/doc/xmlformat.conf @@ -67,6 +67,7 @@ programlisting screen entry-break = 0 exit-break = 0 - -#term -# format inline +# This is needed so that the spacing inside those tags is kept. +term cmdsynopsis arg + normalize yes + format block From bc0421c4cf18c431ece8d6a19f723159316f55ff Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 20:26:27 -0400 Subject: [PATCH 02/63] doc: Adds xml fixing script. (see previous and next commits) This script is used to automatically fix issues within xml documentation files. The script is *for now* intended to be used ad-hoc, and the commits to be examined. A future discussion will define whether: * This commit and scripts are kept. * The script is extended for common use. The biggest issue right now with the script is that it *could* in theory destroy a valid space-less varlistentry. The script could, in practical use, be changed and extended to normalize some parts of the XML files, mainly: * A common quoting style for attributes * Fix-up some weird formatting automatically that xmlformat doesn't catch --- doc/Makefile | 5 ++ doc/shell.nix | 2 +- nixos/doc/manual/Makefile | 5 ++ nixos/doc/manual/shell.nix | 2 +- nixos/doc/varlistentry-fixer.rb | 124 ++++++++++++++++++++++++++++++++ 5 files changed, 136 insertions(+), 2 deletions(-) create mode 100755 nixos/doc/varlistentry-fixer.rb diff --git a/doc/Makefile b/doc/Makefile index 8a4612e95f19..ba77be6678c4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -12,6 +12,11 @@ format: find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {} +.PHONY: fix-misc-xml +fix-misc-xml: + find . -iname '*.xml' -type f \ + -exec ../nixos/doc/varlistentry-fixer.rb {} ';' + .PHONY: clean clean: rm -f ${MD_TARGETS} .version manual-full.xml diff --git a/doc/shell.nix b/doc/shell.nix index e8da2eaf16be..24fe20e81050 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,5 +1,5 @@ { pkgs ? import ../. {} }: (import ./default.nix).overrideAttrs (x: { - buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; + buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ]; }) diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile index 2e2322d5fb51..5cbbf140869a 100644 --- a/nixos/doc/manual/Makefile +++ b/nixos/doc/manual/Makefile @@ -14,6 +14,11 @@ format: find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ xmlformat --config-file "../xmlformat.conf" -i {} +.PHONY: fix-misc-xml +fix-misc-xml: + find . -iname '*.xml' -type f \ + -exec ../varlistentry-fixer.rb {} ';' + .PHONY: clean clean: rm -f manual-combined.xml generated diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 7f8422b4ec11..cc3609d750e0 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -4,5 +4,5 @@ in pkgs.mkShell { name = "nixos-manual"; - buildInputs = with pkgs; [ xmlformat jing xmloscopy ]; + buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ]; } diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb new file mode 100755 index 000000000000..6c7cc1e6439b --- /dev/null +++ b/nixos/doc/varlistentry-fixer.rb @@ -0,0 +1,124 @@ +#!/usr/bin/env ruby + +# This script is written intended as a living, evolving tooling +# to fix oopsies within the docbook documentation. +# +# This is *not* a formatter. It, instead, handles some known cases +# where something bad happened, and fixing it manually is tedious. +# +# Read the code to see the different cases it handles. +# +# ALWAYS `make format` after fixing with this! +# ALWAYS read the changes, this tool isn't yet proven to be always right. + +require "rexml/document" +include REXML + +if ARGV.length < 1 then + $stderr.puts "Needs a filename." + exit 1 +end + +filename = ARGV.shift +doc = Document.new(File.open(filename)) + +$touched = false + +# Fixing varnames having a sibling element without spacing. +# This is to fix an initial `xmlformat` issue where `term` +# would mangle as spaces. +# +# +# types.separatedStringsep <---- +# +# ... +# +# Generates: types.separatedStringsep +# ^^^^ +# +# +# +# makeWrapperexecutablewrapperfileargs <---- +# +# +# Generates: makeWrapperexecutablewrapperfileargs +# ^^^^ ^^^^ ^^ ^^ +# +# +# namevalue <----- +# +# +# Generates: --optionnamevalue +# ^^ ^^ +doc.elements.each("//varlistentry/term") do |term| + ["varname", "function", "option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end +end + + + +# +# nixos-option +# +# path <------ +# +# +# Generates: -Ipath +# ^^ +doc.elements.each("//cmdsynopsis/arg") do |term| + ["option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end +end + +# +# +# +# +# +# +# +# +# +# +# name <---- +# +# +# Generates: [{--profile-name | -p }name] +# ^^^^ +doc.elements.each("//cmdsynopsis/arg") do |term| + ["group"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end +end + + +if $touched then + doc.context[:attribute_quote] = :quote + doc.write(output: File.open(filename, "w")) +end From a45edd9024b8fdbe1ace26d7bd8e39370e96ae52 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 21:03:37 -0400 Subject: [PATCH 03/63] doc: ran `make format` With visual inspection that nothing got worse. --- doc/coding-conventions.xml | 168 +++++++++--- doc/cross-compilation.xml | 27 +- doc/functions.xml | 48 ++-- doc/languages-frameworks/bower.xml | 4 +- doc/meta.xml | 52 ++-- doc/multiple-output.xml | 32 +-- doc/package-notes.xml | 12 +- doc/stdenv.xml | 426 +++++++++++++++++++---------- 8 files changed, 513 insertions(+), 256 deletions(-) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index f244c11d4f20..b3f7f093835c 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -312,11 +312,15 @@ args.stdenv.mkDerivation (args // { - If it’s used to support software development: + + If it’s used to support software development: + - If it’s a library used by other packages: + + If it’s a library used by other packages: + development/libraries (e.g. @@ -325,7 +329,9 @@ args.stdenv.mkDerivation (args // { - If it’s a compiler: + + If it’s a compiler: + development/compilers (e.g. @@ -334,7 +340,9 @@ args.stdenv.mkDerivation (args // { - If it’s an interpreter: + + If it’s an interpreter: + development/interpreters (e.g. @@ -343,11 +351,15 @@ args.stdenv.mkDerivation (args // { - If it’s a (set of) development tool(s): + + If it’s a (set of) development tool(s): + - If it’s a parser generator (including lexers): + + If it’s a parser generator (including lexers): + development/tools/parsing (e.g. @@ -356,7 +368,9 @@ args.stdenv.mkDerivation (args // { - If it’s a build manager: + + If it’s a build manager: + development/tools/build-managers (e.g. @@ -365,7 +379,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + development/tools/misc (e.g. @@ -377,7 +393,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + development/misc @@ -388,7 +406,9 @@ args.stdenv.mkDerivation (args // { - If it’s a (set of) tool(s): + + If it’s a (set of) tool(s): + (A tool is a relatively small program, especially one intended to be @@ -396,7 +416,9 @@ args.stdenv.mkDerivation (args // { - If it’s for networking: + + If it’s for networking: + tools/networking (e.g. @@ -405,7 +427,9 @@ args.stdenv.mkDerivation (args // { - If it’s for text processing: + + If it’s for text processing: + tools/text (e.g. diffutils) @@ -413,9 +437,9 @@ args.stdenv.mkDerivation (args // { - If it’s a system utility, i.e., - something related or essential to the operation of a - system: + + If it’s a system utility, i.e., something related or essential to the operation of a system: + tools/system (e.g. cron) @@ -423,8 +447,9 @@ args.stdenv.mkDerivation (args // { - If it’s an archiver (which may - include a compression function): + + If it’s an archiver (which may include a compression function): + tools/archivers (e.g. zip, @@ -433,7 +458,9 @@ args.stdenv.mkDerivation (args // { - If it’s a compression program: + + If it’s a compression program: + tools/compression (e.g. @@ -442,7 +469,9 @@ args.stdenv.mkDerivation (args // { - If it’s a security-related program: + + If it’s a security-related program: + tools/security (e.g. nmap, @@ -451,7 +480,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + tools/misc @@ -462,7 +493,9 @@ args.stdenv.mkDerivation (args // { - If it’s a shell: + + If it’s a shell: + shells (e.g. bash) @@ -470,11 +503,15 @@ args.stdenv.mkDerivation (args // { - If it’s a server: + + If it’s a server: + - If it’s a web server: + + If it’s a web server: + servers/http (e.g. @@ -483,7 +520,9 @@ args.stdenv.mkDerivation (args // { - If it’s an implementation of the X Windowing System: + + If it’s an implementation of the X Windowing System: + servers/x11 (e.g. xorg — @@ -492,7 +531,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + servers/misc @@ -503,7 +544,9 @@ args.stdenv.mkDerivation (args // { - If it’s a desktop environment: + + If it’s a desktop environment: + desktops (e.g. kde, @@ -512,7 +555,9 @@ args.stdenv.mkDerivation (args // { - If it’s a window manager: + + If it’s a window manager: + applications/window-managers (e.g. @@ -521,7 +566,9 @@ args.stdenv.mkDerivation (args // { - If it’s an application: + + If it’s an application: + A (typically large) program with a distinct user interface, primarily @@ -529,7 +576,9 @@ args.stdenv.mkDerivation (args // { - If it’s a version management system: + + If it’s a version management system: + applications/version-management (e.g. @@ -538,7 +587,9 @@ args.stdenv.mkDerivation (args // { - If it’s for video playback / editing: + + If it’s for video playback / editing: + applications/video (e.g. @@ -547,7 +598,9 @@ args.stdenv.mkDerivation (args // { - If it’s for graphics viewing / editing: + + If it’s for graphics viewing / editing: + applications/graphics (e.g. @@ -556,11 +609,15 @@ args.stdenv.mkDerivation (args // { - If it’s for networking: + + If it’s for networking: + - If it’s a mailreader: + + If it’s a mailreader: + applications/networking/mailreaders (e.g. @@ -569,7 +626,9 @@ args.stdenv.mkDerivation (args // { - If it’s a newsreader: + + If it’s a newsreader: + applications/networking/newsreaders (e.g. @@ -578,7 +637,9 @@ args.stdenv.mkDerivation (args // { - If it’s a web browser: + + If it’s a web browser: + applications/networking/browsers (e.g. @@ -587,7 +648,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + applications/networking/misc @@ -598,7 +661,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + applications/misc @@ -609,12 +674,15 @@ args.stdenv.mkDerivation (args // { - If it’s data (i.e., does not have a - straight-forward executable semantics): + + If it’s data (i.e., does not have a straight-forward executable semantics): + - If it’s a font: + + If it’s a font: + data/fonts @@ -622,11 +690,15 @@ args.stdenv.mkDerivation (args // { - If it’s related to SGML/XML processing: + + If it’s related to SGML/XML processing: + - If it’s an XML DTD: + + If it’s an XML DTD: + data/sgml+xml/schemas/xml-dtd (e.g. @@ -635,7 +707,9 @@ args.stdenv.mkDerivation (args // { - If it’s an XSLT stylesheet: + + If it’s an XSLT stylesheet: + (Okay, these are executable...) @@ -653,7 +727,9 @@ args.stdenv.mkDerivation (args // { - If it’s a game: + + If it’s a game: + games @@ -661,7 +737,9 @@ args.stdenv.mkDerivation (args // { - Else: + + Else: + misc diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index fe0e0d88d30e..3b433fdcc1d2 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -60,7 +60,8 @@ - buildPlatform + + buildPlatform @@ -71,7 +72,8 @@ - hostPlatform + + hostPlatform @@ -82,7 +84,8 @@ - targetPlatform + + targetPlatform @@ -128,7 +131,8 @@ - system + + system @@ -141,7 +145,8 @@ - config + + config @@ -157,7 +162,8 @@ - parsed + + parsed @@ -171,7 +177,8 @@ - libc + + libc @@ -183,7 +190,8 @@ - is* + + is* @@ -195,7 +203,8 @@ - platform + + platform diff --git a/doc/functions.xml b/doc/functions.xml index cdae96703f13..746ef7131f86 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -321,7 +321,8 @@ merge:"diff3" - name + + name @@ -330,7 +331,8 @@ merge:"diff3" - targetPkgs + + targetPkgs @@ -340,7 +342,8 @@ merge:"diff3" - multiPkgs + + multiPkgs @@ -351,7 +354,8 @@ merge:"diff3" - extraBuildCommands + + extraBuildCommands @@ -361,7 +365,8 @@ merge:"diff3" - extraBuildCommandsMulti + + extraBuildCommandsMulti @@ -371,7 +376,8 @@ merge:"diff3" - extraOutputsToInstall + + extraOutputsToInstall @@ -381,7 +387,8 @@ merge:"diff3" - extraInstallCommands + + extraInstallCommands @@ -391,7 +398,8 @@ merge:"diff3" - runScript + + runScript @@ -624,9 +632,9 @@ merge:"diff3" 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. + in that can be used to pull a Docker image from a Docker registry. By + default Docker Hub is + used to pull images. @@ -648,15 +656,15 @@ merge:"diff3" - imageName specifies the name of the image to be downloaded, - which can also include the registry namespace (e.g. nixos). - This argument is required. + 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 + 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 @@ -666,10 +674,10 @@ merge:"diff3" - 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. + 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. diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml index db7536cdc14e..118f6e10473a 100644 --- a/doc/languages-frameworks/bower.xml +++ b/doc/languages-frameworks/bower.xml @@ -205,8 +205,8 @@ pkgs.stdenv.mkDerivation { - ENOCACHE errors from - buildBowerComponents + + ENOCACHE errors from buildBowerComponents diff --git a/doc/meta.xml b/doc/meta.xml index ab6befd4381c..496b32916552 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -83,7 +83,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - description + + description @@ -106,7 +107,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - longDescription + + longDescription @@ -115,7 +117,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - branch + + branch @@ -126,7 +129,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - homepage + + homepage @@ -136,7 +140,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - downloadPage + + downloadPage @@ -146,7 +151,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - license + + license @@ -198,7 +204,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - maintainers + + maintainers @@ -213,7 +220,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - priority + + priority @@ -225,7 +233,8 @@ hello-2.3 A program that produces a familiar, friendly greeting - platforms + + platforms @@ -242,7 +251,8 @@ meta.platforms = stdenv.lib.platforms.linux; - hydraPlatforms + + hydraPlatforms @@ -261,7 +271,8 @@ meta.hydraPlatforms = []; - broken + + broken @@ -273,7 +284,8 @@ meta.hydraPlatforms = []; - updateWalker + + updateWalker @@ -305,8 +317,8 @@ meta.hydraPlatforms = []; generic options are available: - stdenv.lib.licenses.free, - "free" + + stdenv.lib.licenses.free, "free" @@ -315,8 +327,8 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.unfreeRedistributable, - "unfree-redistributable" + + stdenv.lib.licenses.unfreeRedistributable, "unfree-redistributable" @@ -336,8 +348,8 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.unfree, - "unfree" + + stdenv.lib.licenses.unfree, "unfree" @@ -348,8 +360,8 @@ meta.hydraPlatforms = []; - stdenv.lib.licenses.unfreeRedistributableFirmware, - "unfree-redistributable-firmware" + + stdenv.lib.licenses.unfreeRedistributableFirmware, "unfree-redistributable-firmware" diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 040c12c92913..981b4b966cdf 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -188,8 +188,8 @@ - - $outputDev + + $outputDev @@ -200,8 +200,8 @@ - - $outputBin + + $outputBin @@ -211,8 +211,8 @@ - - $outputLib + + $outputLib @@ -223,8 +223,8 @@ - - $outputDoc + + $outputDoc @@ -235,8 +235,8 @@ - - $outputDevdoc + + $outputDevdoc @@ -248,8 +248,8 @@ - - $outputMan + + $outputMan @@ -259,8 +259,8 @@ - - $outputDevman + + $outputDevman @@ -270,8 +270,8 @@ - - $outputInfo + + $outputInfo diff --git a/doc/package-notes.xml b/doc/package-notes.xml index f16826ae6806..a6347bfdebaf 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -428,7 +428,9 @@ packageOverrides = pkgs: { - Steam fails to start. What do I do? + + Steam fails to start. What do I do? + Try to run @@ -438,7 +440,9 @@ packageOverrides = pkgs: { - Using the FOSS Radeon or nouveau (nvidia) drivers + + Using the FOSS Radeon or nouveau (nvidia) drivers + @@ -462,7 +466,9 @@ packageOverrides = pkgs: { - Java + + Java + diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 78fa1d209b58..f6180d5ca6a8 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -361,7 +361,8 @@ let f(h, h + 1, i) = i + h Variables specifying dependencies - depsBuildBuild + + depsBuildBuild @@ -386,7 +387,8 @@ let f(h, h + 1, i) = i + h - nativeBuildInputs + + nativeBuildInputs @@ -412,7 +414,8 @@ let f(h, h + 1, i) = i + h - depsBuildTarget + + depsBuildTarget @@ -451,7 +454,8 @@ let f(h, h + 1, i) = i + h - depsHostHost + + depsHostHost @@ -469,7 +473,8 @@ let f(h, h + 1, i) = i + h - buildInputs + + buildInputs @@ -492,7 +497,8 @@ let f(h, h + 1, i) = i + h - depsTargetTarget + + depsTargetTarget @@ -508,7 +514,8 @@ let f(h, h + 1, i) = i + h - depsBuildBuildPropagated + + depsBuildBuildPropagated @@ -519,7 +526,8 @@ let f(h, h + 1, i) = i + h - propagatedNativeBuildInputs + + propagatedNativeBuildInputs @@ -539,7 +547,8 @@ let f(h, h + 1, i) = i + h - depsBuildTargetPropagated + + depsBuildTargetPropagated @@ -549,7 +558,8 @@ let f(h, h + 1, i) = i + h - depsHostHostPropagated + + depsHostHostPropagated @@ -558,7 +568,8 @@ let f(h, h + 1, i) = i + h - propagatedBuildInputs + + propagatedBuildInputs @@ -569,7 +580,8 @@ let f(h, h + 1, i) = i + h - depsTargetTarget + + depsTargetTarget @@ -586,7 +598,8 @@ let f(h, h + 1, i) = i + h Variables affecting <literal>stdenv</literal> initialisation - NIX_DEBUG + + NIX_DEBUG @@ -607,7 +620,8 @@ let f(h, h + 1, i) = i + h Variables affecting build properties - enableParallelBuilding + + enableParallelBuilding @@ -624,7 +638,8 @@ let f(h, h + 1, i) = i + h - preferLocalBuild + + preferLocalBuild @@ -642,7 +657,8 @@ let f(h, h + 1, i) = i + h Special variables - passthru + + passthru @@ -707,7 +723,8 @@ passthru = { Variables affecting phase control - phases + + phases @@ -727,7 +744,8 @@ passthru = { - prePhases + + prePhases @@ -736,7 +754,8 @@ passthru = { - preConfigurePhases + + preConfigurePhases @@ -745,7 +764,8 @@ passthru = { - preBuildPhases + + preBuildPhases @@ -754,7 +774,8 @@ passthru = { - preInstallPhases + + preInstallPhases @@ -763,7 +784,8 @@ passthru = { - preFixupPhases + + preFixupPhases @@ -772,7 +794,8 @@ passthru = { - preDistPhases + + preDistPhases @@ -781,7 +804,8 @@ passthru = { - postPhases + + postPhases @@ -804,7 +828,9 @@ passthru = { default: - Tar files + + Tar files + These can optionally be compressed using gzip @@ -817,7 +843,9 @@ passthru = { - Zip files + + Zip files + Zip files are unpacked using unzip. However, @@ -827,7 +855,9 @@ passthru = { - Directories in the Nix store + + Directories in the Nix store + These are simply copied to the current directory. The hash part of the @@ -847,7 +877,8 @@ passthru = { Variables controlling the unpack phase - srcs / src + + srcs / src @@ -857,7 +888,8 @@ passthru = { - sourceRoot + + sourceRoot @@ -869,7 +901,8 @@ passthru = { - setSourceRoot + + setSourceRoot @@ -881,7 +914,8 @@ passthru = { - preUnpack + + preUnpack @@ -890,7 +924,8 @@ passthru = { - postUnpack + + postUnpack @@ -899,7 +934,8 @@ passthru = { - dontMakeSourcesWritable + + dontMakeSourcesWritable @@ -911,7 +947,8 @@ passthru = { - unpackCmd + + unpackCmd @@ -935,7 +972,8 @@ passthru = { Variables controlling the patch phase - patches + + patches @@ -948,7 +986,8 @@ passthru = { - patchFlags + + patchFlags @@ -959,7 +998,8 @@ passthru = { - prePatch + + prePatch @@ -968,7 +1008,8 @@ passthru = { - postPatch + + postPatch @@ -991,7 +1032,8 @@ passthru = { Variables controlling the configure phase - configureScript + + configureScript @@ -1003,7 +1045,8 @@ passthru = { - configureFlags + + configureFlags @@ -1013,7 +1056,8 @@ passthru = { - configureFlagsArray + + configureFlagsArray @@ -1024,7 +1068,8 @@ passthru = { - dontAddPrefix + + dontAddPrefix @@ -1034,7 +1079,8 @@ passthru = { - prefix + + prefix @@ -1045,7 +1091,8 @@ passthru = { - dontAddDisableDepTrack + + dontAddDisableDepTrack @@ -1056,7 +1103,8 @@ passthru = { - dontFixLibtool + + dontFixLibtool @@ -1076,7 +1124,8 @@ passthru = { - dontDisableStatic + + dontDisableStatic @@ -1090,7 +1139,8 @@ passthru = { - configurePlatforms + + configurePlatforms @@ -1111,7 +1161,8 @@ passthru = { - preConfigure + + preConfigure @@ -1120,7 +1171,8 @@ passthru = { - postConfigure + + postConfigure @@ -1146,7 +1198,8 @@ passthru = { Variables controlling the build phase - dontBuild + + dontBuild @@ -1155,7 +1208,8 @@ passthru = { - makefile + + makefile @@ -1164,15 +1218,19 @@ passthru = { - checkInputs - - - A list of dependencies used by the phase. This gets included in - buildInputs when doCheck is set. - + + checkInputs + + + + A list of dependencies used by the phase. This gets included in + buildInputs when doCheck is set. + + - makeFlags + + makeFlags @@ -1193,7 +1251,8 @@ makeFlags = [ "PREFIX=$(out)" ]; - makeFlagsArray + + makeFlagsArray @@ -1211,7 +1270,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - buildFlags / buildFlagsArray + + buildFlags / buildFlagsArray @@ -1222,7 +1282,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - preBuild + + preBuild @@ -1231,7 +1292,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - postBuild + + postBuild @@ -1266,7 +1328,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") Variables controlling the check phase - doCheck + + doCheck @@ -1282,9 +1345,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - makeFlags / - makeFlagsArray / - makefile + + makeFlags / makeFlagsArray / makefile @@ -1293,7 +1355,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - checkTarget + + checkTarget @@ -1303,7 +1366,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - checkFlags / checkFlagsArray + + checkFlags / checkFlagsArray @@ -1314,7 +1378,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - preCheck + + preCheck @@ -1323,7 +1388,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - postCheck + + postCheck @@ -1347,9 +1413,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") Variables controlling the install phase - makeFlags / - makeFlagsArray / - makefile + + makeFlags / makeFlagsArray / makefile @@ -1358,7 +1423,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - installTargets + + installTargets @@ -1370,7 +1436,8 @@ installTargets = "install-bin install-doc"; - installFlags / installFlagsArray + + installFlags / installFlagsArray @@ -1381,7 +1448,8 @@ installTargets = "install-bin install-doc"; - preInstall + + preInstall @@ -1390,7 +1458,8 @@ installTargets = "install-bin install-doc"; - postInstall + + postInstall @@ -1444,7 +1513,8 @@ installTargets = "install-bin install-doc"; Variables controlling the fixup phase - dontStrip + + dontStrip @@ -1454,7 +1524,8 @@ installTargets = "install-bin install-doc"; - dontStripHost + + dontStripHost @@ -1466,7 +1537,8 @@ installTargets = "install-bin install-doc"; - dontStripTarget + + dontStripTarget @@ -1478,7 +1550,8 @@ installTargets = "install-bin install-doc"; - dontMoveSbin + + dontMoveSbin @@ -1488,7 +1561,8 @@ installTargets = "install-bin install-doc"; - stripAllList + + stripAllList @@ -1500,7 +1574,8 @@ installTargets = "install-bin install-doc"; - stripAllFlags + + stripAllFlags @@ -1511,7 +1586,8 @@ installTargets = "install-bin install-doc"; - stripDebugList + + stripDebugList @@ -1522,7 +1598,8 @@ installTargets = "install-bin install-doc"; - stripDebugFlags + + stripDebugFlags @@ -1533,7 +1610,8 @@ installTargets = "install-bin install-doc"; - dontPatchELF + + dontPatchELF @@ -1543,7 +1621,8 @@ installTargets = "install-bin install-doc"; - dontPatchShebangs + + dontPatchShebangs @@ -1553,7 +1632,8 @@ installTargets = "install-bin install-doc"; - forceShare + + forceShare @@ -1564,7 +1644,8 @@ installTargets = "install-bin install-doc"; - setupHook + + setupHook @@ -1579,7 +1660,8 @@ installTargets = "install-bin install-doc"; - preFixup + + preFixup @@ -1588,7 +1670,8 @@ installTargets = "install-bin install-doc"; - postFixup + + postFixup @@ -1597,7 +1680,8 @@ installTargets = "install-bin install-doc"; - separateDebugInfo + + separateDebugInfo @@ -1639,7 +1723,8 @@ set debug-file-directory ~/.nix-profile/lib/debug Variables controlling the installCheck phase - doInstallCheck + + doInstallCheck @@ -1655,16 +1740,20 @@ set debug-file-directory ~/.nix-profile/lib/debug - installCheckInputs - - - A list of dependencies used by the phase. This gets included in - buildInputs when doInstallCheck - is set. - + + installCheckInputs + + + + A list of dependencies used by the phase. This gets included in + buildInputs when doInstallCheck is + set. + + - preInstallCheck + + preInstallCheck @@ -1673,7 +1762,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - postInstallCheck + + postInstallCheck @@ -1698,7 +1788,8 @@ set debug-file-directory ~/.nix-profile/lib/debug Variables controlling the distribution phase - distTarget + + distTarget @@ -1708,7 +1799,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - distFlags / distFlagsArray + + distFlags / distFlagsArray @@ -1717,7 +1809,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - tarballs + + tarballs @@ -1728,7 +1821,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - dontCopyDist + + dontCopyDist @@ -1737,7 +1831,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - preDist + + preDist @@ -1746,7 +1841,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - postDist + + postDist @@ -1766,7 +1862,8 @@ set debug-file-directory ~/.nix-profile/lib/debug - makeWrapperexecutablewrapperfileargs + + makeWrapperexecutablewrapperfileargs @@ -1791,7 +1888,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - substituteinfileoutfilesubs + + substituteinfileoutfilesubs @@ -1801,7 +1899,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello subs are of the following form: - s1s2 + + s1s2 @@ -1811,7 +1910,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - varName + + varName @@ -1826,7 +1926,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - varNames + + varNames @@ -1860,7 +1961,8 @@ substitute ./foo.in ./foo.out \ - substituteInPlacefilesubs + + substituteInPlacefilesubs @@ -1870,7 +1972,8 @@ substitute ./foo.in ./foo.out \ - substituteAllinfileoutfile + + substituteAllinfileoutfile @@ -1909,7 +2012,8 @@ echo @foo@ - substituteAllInPlacefile + + substituteAllInPlacefile @@ -1919,7 +2023,8 @@ echo @foo@ - stripHashpath + + stripHashpath @@ -1939,7 +2044,8 @@ someVar=$(stripHash $name) - wrapProgramexecutablemakeWrapperArgs + + wrapProgramexecutablemakeWrapperArgs @@ -2039,7 +2145,9 @@ addEnvHooks "$hostOffset" myBashFunction mechanism is only to be used as a last resort, it might be. - Bintools Wrapper + + Bintools Wrapper + Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous @@ -2109,7 +2217,9 @@ addEnvHooks "$hostOffset" myBashFunction - CC Wrapper + + CC Wrapper + CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. @@ -2140,7 +2250,9 @@ addEnvHooks "$hostOffset" myBashFunction - Perl + + Perl + Adds the lib/site_perl subdirectory of each build @@ -2152,7 +2264,9 @@ addEnvHooks "$hostOffset" myBashFunction - Python + + Python + Adds the lib/${python.libPrefix}/site-packages @@ -2162,7 +2276,9 @@ addEnvHooks "$hostOffset" myBashFunction - pkg-config + + pkg-config + Adds the lib/pkgconfig and @@ -2172,7 +2288,9 @@ addEnvHooks "$hostOffset" myBashFunction - Automake + + Automake + Adds the share/aclocal subdirectory of each build @@ -2181,7 +2299,9 @@ addEnvHooks "$hostOffset" myBashFunction - Autoconf + + Autoconf + The autoreconfHook derivation adds @@ -2192,7 +2312,9 @@ addEnvHooks "$hostOffset" myBashFunction - libxml2 + + libxml2 + Adds every file named catalog.xml found under the @@ -2203,7 +2325,9 @@ addEnvHooks "$hostOffset" myBashFunction - teTeX / TeX Live + + teTeX / TeX Live + Adds the share/texmf-nix subdirectory of each build @@ -2212,7 +2336,9 @@ addEnvHooks "$hostOffset" myBashFunction - Qt 4 + + Qt 4 + Sets the QTDIR environment variable to Qt’s path. @@ -2220,7 +2346,9 @@ addEnvHooks "$hostOffset" myBashFunction - gdk-pixbuf + + gdk-pixbuf + Exports GDK_PIXBUF_MODULE_FILE environment variable the @@ -2230,7 +2358,9 @@ addEnvHooks "$hostOffset" myBashFunction - GHC + + GHC + Creates a temporary package database and registers every Haskell build @@ -2239,7 +2369,9 @@ addEnvHooks "$hostOffset" myBashFunction - GStreamer + + GStreamer + Adds the GStreamer plugins subdirectory of each build input to the @@ -2249,7 +2381,9 @@ addEnvHooks "$hostOffset" myBashFunction - paxctl + + paxctl + Defines the paxmark helper for setting per-executable @@ -2271,7 +2405,9 @@ addEnvHooks "$hostOffset" myBashFunction - autoPatchelfHook + + autoPatchelfHook + This is a special setup hook which helps in packaging proprietary @@ -2330,7 +2466,8 @@ addEnvHooks "$hostOffset" myBashFunction - format + + format @@ -2354,7 +2491,8 @@ cc1plus: some warnings being treated as errors - stackprotector + + stackprotector @@ -2375,7 +2513,8 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': - fortify + + fortify @@ -2415,7 +2554,8 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro - pic + + pic @@ -2439,7 +2579,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le - strictoverflow + + strictoverflow @@ -2457,7 +2598,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le - relro + + relro @@ -2477,7 +2619,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le - bindnow + + bindnow @@ -2509,7 +2652,8 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec - pie + + pie From 88ca2b1ec4fcdadb48ed6084b2bf4cae58d6ccea Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 21:03:51 -0400 Subject: [PATCH 04/63] nixos/doc: ran `make format` With visual inspection that nothing got worse. --- .../manual/administration/boot-problems.xml | 15 +- .../doc/manual/configuration/config-file.xml | 24 +++- .../doc/manual/development/building-parts.xml | 27 ++-- .../development/option-declarations.xml | 12 +- nixos/doc/manual/development/option-types.xml | 129 +++++++++++------ .../development/writing-nixos-tests.xml | 81 +++++++---- nixos/doc/manual/installation/installing.xml | 20 ++- nixos/doc/manual/man-nixos-build-vms.xml | 27 ++-- nixos/doc/manual/man-nixos-enter.xml | 49 +++++-- .../doc/manual/man-nixos-generate-config.xml | 43 ++++-- nixos/doc/manual/man-nixos-install.xml | 100 +++++++++---- nixos/doc/manual/man-nixos-option.xml | 30 ++-- nixos/doc/manual/man-nixos-rebuild.xml | 135 ++++++++++++------ nixos/doc/manual/man-nixos-version.xml | 28 ++-- nixos/doc/manual/release-notes/rl-1509.xml | 10 +- nixos/doc/manual/release-notes/rl-1809.xml | 101 +++++++------ 16 files changed, 558 insertions(+), 273 deletions(-) diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index 5f05ad261ef3..de3d8ac21aeb 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -14,7 +14,8 @@ NixOS boot scripts or by systemd: - boot.shell_on_fail + + boot.shell_on_fail @@ -25,7 +26,8 @@ - boot.debug1 + + boot.debug1 @@ -37,7 +39,8 @@ - boot.trace + + boot.trace @@ -46,7 +49,8 @@ - single + + single @@ -59,7 +63,8 @@ - systemd.log_level=debug systemd.log_target=console + + systemd.log_level=debug systemd.log_target=console diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index a9420b3fc921..8a1a39c98c10 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -80,7 +80,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no Options have various types of values. The most important are: - Strings + + Strings + Strings are enclosed in double quotes, e.g. @@ -112,7 +114,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no - Booleans + + Booleans + These can be true or false, e.g. @@ -124,7 +128,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no - Integers + + Integers + For example, @@ -141,7 +147,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no - Sets + + Sets + Sets were introduced above. They are name/value pairs enclosed in braces, @@ -157,7 +165,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no - Lists + + Lists + The important thing to note about lists is that list elements are @@ -173,7 +183,9 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - Packages + + Packages + Usually, the packages you need are already part of the Nix Packages diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml index 031048aaa377..eaffc0ef47c2 100644 --- a/nixos/doc/manual/development/building-parts.xml +++ b/nixos/doc/manual/development/building-parts.xml @@ -15,7 +15,8 @@ $ nix-build -A config.option include: - system.build.toplevel + + system.build.toplevel @@ -32,7 +33,8 @@ $ nix-build -A system - system.build.manual.manual + + system.build.manual.manual @@ -41,7 +43,8 @@ $ nix-build -A system - system.build.etc + + system.build.etc @@ -51,9 +54,11 @@ $ nix-build -A system - system.build.initialRamdisk + + system.build.initialRamdisk - system.build.kernel + + system.build.kernel @@ -69,11 +74,14 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/ - system.build.nixos-rebuild + + system.build.nixos-rebuild - system.build.nixos-install + + system.build.nixos-install - system.build.nixos-generate-config + + system.build.nixos-generate-config @@ -82,7 +90,8 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/ - systemd.units.unit-name.unit + + systemd.units.unit-name.unit diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index a8f528a0a804..eee81bf64263 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -32,7 +32,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> The function mkOption accepts the following arguments. - type + + type @@ -43,7 +44,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> - default + + default @@ -55,7 +57,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> - example + + example @@ -64,7 +67,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> - description + + description diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 5cb747e6d9f1..bf2e38b4c4d6 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -22,7 +22,8 @@ - types.attrs + + types.attrs @@ -31,7 +32,8 @@ - types.bool + + types.bool @@ -41,7 +43,8 @@ - types.path + + types.path @@ -52,7 +55,8 @@ - types.package + + types.package @@ -68,7 +72,8 @@ - types.int + + types.int @@ -77,7 +82,8 @@ - types.ints.{s8, s16, s32} + + types.ints.{s8, s16, s32} @@ -91,7 +97,8 @@ - types.ints.unsigned + + types.ints.unsigned @@ -100,7 +107,8 @@ - types.ints.{u8, u16, u32} + + types.ints.{u8, u16, u32} @@ -114,7 +122,8 @@ - types.ints.positive + + types.ints.positive @@ -130,7 +139,8 @@ - types.str + + types.str @@ -139,7 +149,8 @@ - types.lines + + types.lines @@ -149,7 +160,8 @@ - types.commas + + types.commas @@ -159,7 +171,8 @@ - types.envVar + + types.envVar @@ -169,7 +182,8 @@ - types.strMatching + + types.strMatching @@ -191,7 +205,8 @@ - types.enuml + + types.enuml @@ -202,7 +217,8 @@ - types.separatedStringsep + + types.separatedStringsep @@ -212,7 +228,8 @@ - types.ints.betweenlowesthighest + + types.ints.betweenlowesthighest @@ -223,7 +240,8 @@ - types.submoduleo + + types.submoduleo @@ -250,7 +268,8 @@ - types.listOft + + types.listOft @@ -260,7 +279,8 @@ - types.attrsOft + + types.attrsOft @@ -271,7 +291,8 @@ - types.loaOft + + types.loaOft @@ -281,7 +302,8 @@ - types.nullOrt + + types.nullOrt @@ -291,7 +313,8 @@ - types.uniqt + + types.uniqt @@ -301,7 +324,8 @@ - types.eithert1t2 + + types.eithert1t2 @@ -312,7 +336,8 @@ - types.coercedTofromfto + + types.coercedTofromfto @@ -468,7 +493,8 @@ config.mod.two = { foo = 2; bar = "two"; }; - check + + check @@ -501,7 +527,8 @@ nixThings = mkOption { - merge + + merge @@ -534,7 +561,8 @@ nixThings = mkOption { - name + + name @@ -543,7 +571,8 @@ nixThings = mkOption { - definition + + definition @@ -553,7 +582,8 @@ nixThings = mkOption { - check + + check @@ -565,7 +595,8 @@ nixThings = mkOption { - merge + + merge @@ -573,7 +604,8 @@ nixThings = mkOption { - loc + + loc @@ -583,7 +615,8 @@ nixThings = mkOption { - defs + + defs @@ -600,7 +633,8 @@ nixThings = mkOption { - getSubOptions + + getSubOptions @@ -615,7 +649,8 @@ nixThings = mkOption { - getSubModules + + getSubModules @@ -628,7 +663,8 @@ nixThings = mkOption { - substSubModules + + substSubModules @@ -644,7 +680,8 @@ nixThings = mkOption { - typeMerge + + typeMerge @@ -654,7 +691,8 @@ nixThings = mkOption { - f + + f @@ -670,7 +708,8 @@ nixThings = mkOption { - functor + + functor @@ -679,7 +718,8 @@ nixThings = mkOption { - type + + type @@ -688,7 +728,8 @@ nixThings = mkOption { - wrapped + + wrapped @@ -697,7 +738,8 @@ nixThings = mkOption { - payload + + payload @@ -709,7 +751,8 @@ nixThings = mkOption { - binOp + + binOp diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 89a6a4423627..5935fbc049bd 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -54,7 +54,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf - + + @@ -63,7 +64,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf - + + @@ -75,7 +77,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf - + + @@ -120,7 +123,8 @@ startAll; The following methods are available on machine objects: - start + + start @@ -130,7 +134,8 @@ startAll; - shutdown + + shutdown @@ -139,7 +144,8 @@ startAll; - crash + + crash @@ -148,7 +154,8 @@ startAll; - block + + block @@ -158,7 +165,8 @@ startAll; - unblock + + unblock @@ -167,7 +175,8 @@ startAll; - screenshot + + screenshot @@ -177,7 +186,8 @@ startAll; - getScreenText + + getScreenText @@ -193,7 +203,8 @@ startAll; - sendMonitorCommand + + sendMonitorCommand @@ -203,7 +214,8 @@ startAll; - sendKeys + + sendKeys @@ -213,7 +225,8 @@ startAll; - sendChars + + sendChars @@ -224,7 +237,8 @@ startAll; - execute + + execute @@ -235,7 +249,8 @@ startAll; - succeed + + succeed @@ -245,7 +260,8 @@ startAll; - fail + + fail @@ -255,7 +271,8 @@ startAll; - waitUntilSucceeds + + waitUntilSucceeds @@ -264,7 +281,8 @@ startAll; - waitUntilFails + + waitUntilFails @@ -273,7 +291,8 @@ startAll; - waitForUnit + + waitForUnit @@ -282,7 +301,8 @@ startAll; - waitForFile + + waitForFile @@ -291,7 +311,8 @@ startAll; - waitForOpenPort + + waitForOpenPort @@ -301,7 +322,8 @@ startAll; - waitForClosedPort + + waitForClosedPort @@ -310,7 +332,8 @@ startAll; - waitForX + + waitForX @@ -319,7 +342,8 @@ startAll; - waitForText + + waitForText @@ -336,7 +360,8 @@ startAll; - waitForWindow + + waitForWindow @@ -346,7 +371,8 @@ startAll; - copyFileFromHost + + copyFileFromHost @@ -361,7 +387,8 @@ startAll; - systemctl + + systemctl diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 4e1fde662d6e..6066d025adbf 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -16,7 +16,9 @@ - UEFI systems + + UEFI systems + You should boot the live CD in UEFI mode (consult your specific @@ -138,7 +140,9 @@ - UEFI systems + + UEFI systems + For creating boot partitions: mkfs.fat. Again @@ -178,7 +182,9 @@ - UEFI systems + + UEFI systems + Mount the boot file system on /mnt/boot, e.g. @@ -234,7 +240,9 @@ - BIOS systems + + BIOS systems + You must set the option @@ -244,7 +252,9 @@ - UEFI systems + + UEFI systems + You must set the option diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index 02dad4c548b8..87e4f3dae869 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -12,14 +12,22 @@ build a network of virtual machines from a network of NixOS configurations - nixos-build-vms - + + nixos-build-vms + + - + + + - + + + - network.nix + + + network.nix @@ -78,7 +86,8 @@ - + + @@ -87,7 +96,8 @@ - + + @@ -96,7 +106,8 @@ - , + + , diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index 7db4b72ee36e..42edaa1ae5b6 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -12,26 +12,40 @@ run a command in a NixOS chroot environment - nixos-enter + + nixos-enter - - root + + + + root + - - system + + + + system + - - shell-command + + + + shell-command + - + + + - - arguments + + + + arguments @@ -50,7 +64,8 @@ - + + @@ -60,7 +75,8 @@ - + + @@ -72,9 +88,11 @@ - + + - + + @@ -83,7 +101,8 @@ - + + diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 8bf90f452db6..1227873f5780 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -12,16 +12,24 @@ generate NixOS configuration modules - nixos-generate-config - - + + nixos-generate-config - - root + + - - dir + + + + root + + + + + + + dir @@ -31,7 +39,8 @@ This command writes two NixOS configuration modules: - + + @@ -53,7 +62,8 @@ - + + @@ -74,7 +84,8 @@ - + + @@ -88,7 +99,8 @@ - + + @@ -99,7 +111,8 @@ - + + @@ -109,7 +122,8 @@ - + + @@ -119,7 +133,8 @@ - + + diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 2d45e83a863f..34b3eef8b212 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -12,47 +12,76 @@ install bootloader and NixOS - nixos-install + + nixos-install - - path + + + + path + - - root + + + + root + - - path + + + + path + - + + + - + + + - + + - - - - - number - - number - - namevalue - + - + + + + + + + + + number + + + + number + + + + namevalue + + + + + + - + + @@ -106,7 +135,8 @@ - + + @@ -117,7 +147,8 @@ - + + @@ -135,7 +166,8 @@ - + + @@ -147,9 +179,11 @@ - + + - + + @@ -160,7 +194,8 @@ - + + @@ -177,7 +212,8 @@ - namevalue + + namevalue @@ -187,7 +223,8 @@ - + + @@ -197,7 +234,8 @@ - + + diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index c22c3811dedf..e087a18eba8f 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -12,14 +12,22 @@ inspect a NixOS configuration - nixos-option - path + + nixos-option + + path - + + + - + + + - option.name + + + option.name @@ -42,7 +50,8 @@ - path + + path @@ -52,7 +61,8 @@ - + + @@ -62,7 +72,8 @@ - + + @@ -76,7 +87,8 @@ Environment - NIXOS_CONFIG + + NIXOS_CONFIG diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index e1a2c7108d18..1dbcfd329bcd 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -12,43 +12,75 @@ reconfigure a NixOS machine - nixos-rebuild - + + nixos-rebuild + + - + + + - + + + - + + + - + + + - + + + - + + + - - + + + + + - + + - + + + - + + + - + + + - + + + - - + + + + - - name + + + + + name - + + @@ -68,7 +100,8 @@ operation. It must be one of the following: - + + @@ -82,7 +115,8 @@ - + + @@ -94,7 +128,8 @@ - + + @@ -107,7 +142,8 @@ - + + @@ -124,7 +160,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system - + + @@ -134,7 +171,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system - + + @@ -147,7 +185,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system - + + @@ -186,7 +225,8 @@ $ ./result/bin/run-*-vm - + + @@ -213,7 +253,8 @@ $ ./result/bin/run-*-vm - + + @@ -222,7 +263,8 @@ $ ./result/bin/run-*-vm - + + @@ -232,7 +274,8 @@ $ ./result/bin/run-*-vm - + + @@ -246,7 +289,8 @@ $ ./result/bin/run-*-vm - + + @@ -258,7 +302,8 @@ $ ./result/bin/run-*-vm - + + @@ -271,9 +316,11 @@ $ ./result/bin/run-*-vm - + + - + + @@ -299,7 +346,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix - + + @@ -323,7 +371,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix - + + @@ -361,7 +410,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix Environment - NIXOS_CONFIG + + NIXOS_CONFIG @@ -371,7 +421,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix - NIX_SSHOPTS + + NIX_SSHOPTS @@ -386,7 +437,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix Files - /run/current-system + + /run/current-system @@ -395,7 +447,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix - /nix/var/nix/profiles/system + + /nix/var/nix/profiles/system diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index c173bce19136..931c4a5ad029 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -11,10 +11,14 @@ show the NixOS version - nixos-version - + + nixos-version + + - + + + @@ -29,7 +33,8 @@ The version consists of the following elements: - 16.03 + + 16.03 @@ -39,7 +44,8 @@ - 1011 + + 1011 @@ -53,7 +59,8 @@ - 6317da4 + + 6317da4 @@ -63,7 +70,8 @@ - Emu + + Emu @@ -83,9 +91,11 @@ - + + - + + diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 734bc076b852..2465f370cf13 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -435,11 +435,11 @@ system.autoUpgrade.enable = true; system.nixos.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. + 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. diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 35dc69515ffd..ae0f35046fff 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -53,10 +53,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - When enabled the iproute2 will copy the files - expected by ip route (e.g., rt_tables) in - /run/iproute2. This allows to write aliases for - routing tables for instance. + + When enabled the iproute2 will copy the files expected + by ip route (e.g., rt_tables) in + /run/iproute2. This allows to write aliases for + routing tables for instance. + @@ -99,20 +101,24 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - 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. + 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. - gnucash has changed from version 2.4 to 3.x. - If you've been using gnucash (version 2.4) instead of - gnucash26 (version 2.6) you must open your Gnucash - data file(s) with gnucash26 and then save them to - upgrade the file format. Then you may use your data file(s) with - Gnucash 3.x. See the upgrade documentation. - Gnucash 2.4 is still available under the attribute gnucash24. + gnucash has changed from version 2.4 to 3.x. If you've + been using gnucash (version 2.4) instead of + gnucash26 (version 2.6) you must open your Gnucash data + file(s) with gnucash26 and then save them to upgrade + the file format. Then you may use your data file(s) with Gnucash 3.x. See + the upgrade + documentation. + Gnucash 2.4 is still available under the attribute + gnucash24. @@ -128,9 +134,9 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - dockerTools.pullImage relies on image digest - instead of image tag to download the image. The - sha256 of a pulled image has to be updated. + dockerTools.pullImage relies on image digest instead of + image tag to download the image. The sha256 of a pulled + image has to be updated. @@ -187,32 +193,40 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' The module for has two new options now: - - - - Puts the generated Diffie-Hellman parameters into the Nix store instead - of managing them in a stateful manner in - /var/lib/dhparams. - + + + + + + Puts the generated Diffie-Hellman parameters into the Nix store instead + of managing them in a stateful manner in + /var/lib/dhparams. + + - - - The default bit size to use for the generated Diffie-Hellman parameters. - + + + + + + The default bit size to use for the generated Diffie-Hellman + parameters. + + - - - The path to the actual generated parameter files should now be queried - using - config.security.dhparams.params.name.path - because it might be either in the Nix store or in a directory configured - by . - - + + + The path to the actual generated parameter files should now be queried + using + config.security.dhparams.params.name.path + because it might be either in the Nix store or in a directory configured + by . + + For developers: @@ -237,20 +251,23 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - networking.networkmanager.useDnsmasq has been deprecated. Use - networking.networkmanager.dns instead. + networking.networkmanager.useDnsmasq has been + deprecated. Use networking.networkmanager.dns instead. - The option services.kubernetes.apiserver.admissionControl - was renamed to services.kubernetes.apiserver.enableAdmissionPlugins. + The option + services.kubernetes.apiserver.admissionControl was + renamed to + services.kubernetes.apiserver.enableAdmissionPlugins. Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS) - Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https. + Therefore; public service port for the dashboard has changed to 443 + (container port 8443) and scheme to https. From 15fa70cd784c641571081420de6fae73894c4481 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 21:07:15 -0400 Subject: [PATCH 05/63] nixos/doc+man: Fixes squishedtogether definitions. --- nixos/doc/manual/development/option-types.xml | 22 +++++++++---------- nixos/doc/manual/man-nixos-install.xml | 8 +++---- nixos/doc/manual/man-nixos-option.xml | 4 ++-- nixos/doc/manual/man-nixos-rebuild.xml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index bf2e38b4c4d6..47dd09158e91 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -206,7 +206,7 @@ - types.enuml + types.enum l @@ -218,7 +218,7 @@ - types.separatedStringsep + types.separatedString sep @@ -229,7 +229,7 @@ - types.ints.betweenlowesthighest + types.ints.between lowest highest @@ -241,7 +241,7 @@ - types.submoduleo + types.submodule o @@ -269,7 +269,7 @@ - types.listOft + types.listOf t @@ -280,7 +280,7 @@ - types.attrsOft + types.attrsOf t @@ -292,7 +292,7 @@ - types.loaOft + types.loaOf t @@ -303,7 +303,7 @@ - types.nullOrt + types.nullOr t @@ -314,7 +314,7 @@ - types.uniqt + types.uniq t @@ -325,7 +325,7 @@ - types.eithert1t2 + types.either t1 t2 @@ -337,7 +337,7 @@ - types.coercedTofromfto + types.coercedTo from f to diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 34b3eef8b212..25f4f40613ac 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -62,15 +62,15 @@ - number + number - number + number - namevalue + name value @@ -213,7 +213,7 @@ - namevalue + name value diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index e087a18eba8f..d436cce742a2 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -15,7 +15,7 @@ nixos-option - path + path @@ -51,7 +51,7 @@ - path + path diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 1dbcfd329bcd..551a65f5e96b 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -76,7 +76,7 @@ - name + name From 6bf54191fb3a7328fa701e408419f29d7bc7ba79 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 21:09:16 -0400 Subject: [PATCH 06/63] doc: Fixes squishedtogether definitions. --- doc/stdenv.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index f6180d5ca6a8..e7f52377e687 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1863,7 +1863,7 @@ set debug-file-directory ~/.nix-profile/lib/debug - makeWrapperexecutablewrapperfileargs + makeWrapper executable wrapperfile args @@ -1889,7 +1889,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - substituteinfileoutfilesubs + substitute infile outfile subs @@ -1900,7 +1900,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - s1s2 + s1 s2 @@ -1911,7 +1911,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - varName + varName @@ -1927,7 +1927,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - varNames + varName s @@ -1962,7 +1962,7 @@ substitute ./foo.in ./foo.out \ - substituteInPlacefilesubs + substituteInPlace file subs @@ -1973,7 +1973,7 @@ substitute ./foo.in ./foo.out \ - substituteAllinfileoutfile + substituteAll infile outfile @@ -2013,7 +2013,7 @@ echo @foo@ - substituteAllInPlacefile + substituteAllInPlace file @@ -2024,7 +2024,7 @@ echo @foo@ - stripHashpath + stripHash path @@ -2045,7 +2045,7 @@ someVar=$(stripHash $name) - wrapProgramexecutablemakeWrapperArgs + wrapProgram executable makeWrapperArgs From e1985dcb8d5a5392c036e04ccc2d3f318dbd3d17 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 1 Jun 2018 17:01:39 +0100 Subject: [PATCH 07/63] Add missing ios triples to bfd --- .../tools/misc/binutils/support-ios.patch | 68 +++++++++++++++++-- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch index 919a3920727f..74e56d130ed5 100644 --- a/pkgs/development/tools/misc/binutils/support-ios.patch +++ b/pkgs/development/tools/misc/binutils/support-ios.patch @@ -1,5 +1,5 @@ diff --git a/bfd/config.bfd b/bfd/config.bfd -index f04a993f06..3357022f35 100644 +index f04a993f06..1e24a9d030 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -238,7 +238,7 @@ case "${targ}" in @@ -20,8 +20,35 @@ index f04a993f06..3357022f35 100644 targ_defvec=arm_mach_o_vec targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +@@ -678,7 +678,7 @@ case "${targ}" in + i[3-7]86-*-aix*) + targ_defvec=i386_coff_vec + ;; +- i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) ++ i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) + targ_defvec=i386_mach_o_vec + targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" + targ64_selvecs=x86_64_mach_o_vec +@@ -762,7 +762,7 @@ case "${targ}" in + targ_defvec=x86_64_elf64_cloudabi_vec + want64=true + ;; +- x86_64-*-darwin*) ++ x86_64-*-darwin* | x86_64-*-ios*) + targ_defvec=x86_64_mach_o_vec + targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" + targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch" +@@ -1402,7 +1402,7 @@ case "${targ}" in + targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec" + targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec" + ;; +- powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*) ++ powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*) + targ_defvec=mach_o_be_vec + targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" + targ_archs="$targ_archs bfd_i386_arch" diff --git a/configure.ac b/configure.ac -index aae94501e4..4b1121e0d1 100644 +index aae94501e4..2cceb4dad4 100644 --- a/configure.ac +++ b/configure.ac @@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then @@ -33,9 +60,18 @@ index aae94501e4..4b1121e0d1 100644 ;; nvptx*-*-*) ;; -@@ -706,7 +706,7 @@ case "${target}" in +@@ -700,13 +700,13 @@ esac + + # Disable libffi for some systems. + case "${target}" in +- powerpc-*-darwin*) ++ powerpc-*-darwin* | powerpc-*-ios*) ;; - x86_64-*-darwin[[912]]*) +- i[[3456789]]86-*-darwin*) ++ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) + ;; +- x86_64-*-darwin[[912]]*) ++ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) ;; - *-*-darwin*) + *-*-darwin* | *-*-ios*) @@ -60,7 +96,7 @@ index aae94501e4..4b1121e0d1 100644 # PR 46986 noconfigdirs="$noconfigdirs target-libgo" ;; -@@ -916,11 +916,11 @@ esac +@@ -916,27 +916,27 @@ esac case "${target}" in *-*-chorusos) ;; @@ -74,7 +110,18 @@ index aae94501e4..4b1121e0d1 100644 noconfigdirs="$noconfigdirs ld gas gdb gprof" noconfigdirs="$noconfigdirs sim target-rda" ;; -@@ -936,7 +936,7 @@ case "${target}" in +- powerpc-*-darwin*) ++ powerpc-*-darwin* | powerpc-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- i[[3456789]]86-*-darwin*) ++ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) + noconfigdirs="$noconfigdirs ld gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- x86_64-*-darwin[[912]]*) ++ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) noconfigdirs="$noconfigdirs ld gas gprof" noconfigdirs="$noconfigdirs sim target-rda" ;; @@ -92,6 +139,15 @@ index aae94501e4..4b1121e0d1 100644 host_makefile_frag="config/mh-darwin" ;; powerpc-*-aix*) +@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + build_lto_plugin=yes + ],[if test x"$default_enable_lto" = x"yes" ; then + case $target in +- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; ++ *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; + # On other non-ELF platforms, LTO has yet to be validated. + *) enable_lto=no ;; + esac @@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. # warn during gcc/ subconfigure; unless you're bootstrapping with # -flto it won't be needed until after installation anyway. From e01a2dec8be0a8e8efa63b0bcf7913aa166294bf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 16 Apr 2018 02:22:22 +0200 Subject: [PATCH 08/63] claws-mail: add support for python plugin --- .../mailreaders/claws-mail/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 10daeeab8e13..4d3c8a797412 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, wrapGAppsHook +{ fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 +, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 , glib-networking, gsettings-desktop-schemas, libSM, libytnef # Build options @@ -10,7 +10,6 @@ # provided: # gdata requires libgdata # geolocation requires libchamplain -# python requires python , enableLdap ? false , enableNetworkManager ? false , enablePgp ? true @@ -19,6 +18,7 @@ , enablePluginNotificationDialogs ? true , enablePluginNotificationSounds ? true , enablePluginPdf ? false +, enablePluginPython ? false , enablePluginRavatar ? false , enablePluginRssyl ? false , enablePluginSmime ? false @@ -43,16 +43,22 @@ stdenv.mkDerivation rec { patches = [ ./mime.patch ]; + preConfigure = '' + # autotools check tries to dlopen libpython as a requirement for the python plugin + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${python}/lib + ''; + postPatch = '' substituteInPlace src/procmime.c \ --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme - libetpan perl python glib-networking libSM libytnef + libetpan perl glib-networking libSM libytnef ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] @@ -77,6 +83,7 @@ stdenv.mkDerivation rec { ++ optional (!enablePluginArchive) "--disable-archive-plugin" ++ optional (!enablePluginFancy) "--disable-fancy-plugin" ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" + ++ optional (!enablePluginPython) "--disable-python-plugin" ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" ++ optional (!enablePluginSmime) "--disable-smime-plugin" @@ -87,8 +94,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + pythonPath = with python.pkgs; [ pygobject2 pygtk ]; + preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") ''; postInstall = '' From 0edad9f5c8d3deb6950537256f6077c2b086896c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 3 Jun 2018 23:49:27 +0200 Subject: [PATCH 09/63] steam: add optional extraProfile --- pkgs/games/steam/chrootenv.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index c44a166268cc..4de5f6608186 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -3,6 +3,7 @@ , withJava ? false , withPrimus ? false , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs +, extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false }: @@ -178,7 +179,7 @@ in buildFHSUserEnv rec { profile = '' export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"} - ''; + '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' #!${stdenv.shell} From d26b629b4c4c6251dd12524a01883b70011f2f0a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 4 Jun 2018 11:25:38 +0000 Subject: [PATCH 10/63] znapzend: fix build fix build by pinning old versions of Perl Libraries --- pkgs/tools/backup/znapzend/default.nix | 34 ++++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 796a34c253a9..7cef9971d765 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let + Mojolicious-6-46 = perlPackages.buildPerlPackage rec { + name = "Mojolicious-6.46"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; + sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; + }; + }; + MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { + name = "Mojo-IOLoop-ForkCall-0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; + sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; + }; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; + }; + version = "0.18.0"; checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in @@ -14,9 +30,7 @@ stdenv.mkDerivation rec { sha256 = checksum; }; - buildInputs = [ perl perlPackages.TestHarness perlPackages.Mojolicious - perlPackages.TAPParserSourceHandlerpgTAP perlPackages.MojoIOLoopForkCall - perlPackages.IOPipely wget ]; + buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; nativeBuildInputs = [ autoconf automake ]; @@ -38,25 +52,25 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ -I${perlPackages.TestHarness}/${perl.libPrefix} \ - -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ -I${perlPackages.TestHarness}/${perl.libPrefix} \ - -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ -I${perlPackages.TestHarness}/${perl.libPrefix} \ - -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " ''; From 0e7c945e15117e88ac494e29c9828ccea2ec32ee Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2018 15:34:21 +0200 Subject: [PATCH 11/63] nixos/systemd: Allow to override serviceConfig This has been reported by @qknight in his Stack Overflow question: https://stackoverflow.com/q/50678639 The correct way to override a single value would be to use something like this: systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no"; However, this doesn't work because the check is applied for the attrsOf type and thus the attribute values might still contain the attribute set created by mkOverride. The unitOption type however did already account for this, but at this stage it's already too late. So now the actual value is unpacked while checking the values of the attribute set, which should allow us to override values in serviceConfig. Signed-off-by: aszlig Cc: @edolstra, @qknight --- nixos/modules/system/boot/systemd-lib.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index ae9ee8811f77..8b37bf8d35d8 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -78,10 +78,16 @@ in rec { optional (badFields != [ ]) "Systemd ${group} has extra fields [${concatStringsSep " " badFields}]."; - checkUnitConfig = group: checks: v: - let errors = concatMap (c: c group v) checks; in - if errors == [] then true - else builtins.trace (concatStringsSep "\n" errors) false; + checkUnitConfig = group: checks: attrs: let + # We're applied at the top-level type (attrsOf unitOption), so the actual + # unit options might contain attributes from mkOverride that we need to + # convert into single values before checking them. + defs = mapAttrs (const (v: + if v._type or "" == "override" then v.content else v + )) attrs; + errors = concatMap (c: c group defs) checks; + in if errors == [] then true + else builtins.trace (concatStringsSep "\n" errors) false; toOption = x: if x == true then "true" From bc158d37fedb307d3b6b6bbf47fd5507c5d2036d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Mon, 4 Jun 2018 16:25:16 +0200 Subject: [PATCH 12/63] eigen3_3: Fix darwin build --- pkgs/development/libraries/eigen/3.3.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index 5d13fb09dcca..7de05926da59 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake}: +{stdenv, fetchurl, fetchpatch, cmake}: let version = "3.3.4"; @@ -11,6 +11,15 @@ stdenv.mkDerivation { name = "eigen-${version}.tar.gz"; sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2"; }; + + patches = [ + # Remove for > 3.3.4 + # Upstream commit from 6 Apr 2018 "Fix cmake scripts with no fortran compiler" + (fetchpatch { + url = "https://bitbucket.org/eigen/eigen/commits/ba14974d054ae9ae4ba88e5e58012fa6c2729c32/raw"; + sha256 = "0fskiy9sbzvp693fcyv3pfq8kxxx3d3mgmaqvjbl5bpfjivij8l1"; + }) + ]; nativeBuildInputs = [ cmake ]; From 27b71b6e762f82600a22c6247e4a22a4a325ad17 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 4 Jun 2018 15:33:32 +0000 Subject: [PATCH 13/63] znapzend: minor comment --- pkgs/tools/backup/znapzend/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 7cef9971d765..f78c300afd0a 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let + # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES Mojolicious-6-46 = perlPackages.buildPerlPackage rec { name = "Mojolicious-6.46"; src = fetchurl { From 7e6d315a89f20d73a2cf151f248e34b3b8adcc5b Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 29 May 2018 18:08:50 -0700 Subject: [PATCH 14/63] PowerShell: init at 6.0.2 --- pkgs/shells/powershell/default.nix | 48 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/shells/powershell/default.nix diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix new file mode 100644 index 000000000000..937494916112 --- /dev/null +++ b/pkgs/shells/powershell/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, cacert, + makeWrapper, less, openssl }: + +let platformString = if stdenv.isDarwin then "osx" + else if stdenv.isLinux then "linux" + else throw "unsupported platform"; + platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf" + else if stdenv.isLinux then "000mmv5iblnmwydfdvg5izli3vpb6l14xy4qy3smcikpf0h87fhl" + else throw "unsupported platform"; + platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" + else if stdenv.isLinux then "LD_LIBRARY_PATH" + else throw "unsupported platform"; +in +stdenv.mkDerivation rec { + name = "powershell-${version}"; + version = "6.0.2"; + + src = fetchzip { + url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; + sha256 = platformSha; + stripRoot = false; + }; + + buildInputs = [ autoPatchelfHook makeWrapper ]; + propagatedBuildInputs = [ libunwind libuuid icu curl cacert less openssl ]; + + # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in + # https://github.com/PowerShell/PowerShell/pull/6144 + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/powershell + cp -r * $out/share/powershell + rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY + makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath [ libunwind libuuid icu openssl curl ]}" \ + --set PAGER ${less}/bin/less --set TERM xterm + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework"; + homepage = https://github.com/PowerShell/PowerShell; + maintainers = [ maintainers.yrashk ]; + platforms = platforms.unix; + license = with licenses; [ mit ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4dcd0314066..44bc4807e3df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21461,4 +21461,6 @@ with pkgs; yrd = callPackage ../tools/networking/yrd { }; + powershell = callPackage ../shells/powershell { }; + } From 84440379bade6fc7c42b11377e0595e6c3ff7117 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 Jun 2018 00:13:47 +0000 Subject: [PATCH 15/63] gradle: 4.7 -> 4.8 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index fbbddbd0fcbc..7570c3be0679 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.7"; + name = "gradle-4.8"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "016vvjvk3gfasv3h6dxxp48kp9v4ariqj280bijn835mr1yhi9gw"; + sha256 = "1fpihf35nd2wqh3ghkk9x0x2nr1s4vx3dgrfn2q4xagsm299dqpk"; }; }; From dda215332f1310fbca6b6b59968d0b46bf29bda8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 31 May 2018 21:10:41 +0200 Subject: [PATCH 16/63] python36Packages.voluptuous-serialize: init at 1.0.0 --- .../voluptuous-serialize/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/voluptuous-serialize/default.nix diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix new file mode 100644 index 000000000000..e2796ee2a74e --- /dev/null +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, voluptuous, pytest }: + +buildPythonPackage rec { + pname = "voluptuous-serialize"; + version = "2018-03-10"; + + disabled = !isPy3k; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = "balloob"; + repo = pname; + rev = "567f0d96f928cf6c30c9f1b8bdee729e651aac82"; + sha256 = "0b16f1bxlqyvi1hy8wmzp2k0rzqcycmdhs8zwsyx0swnvkgwnv50"; + }; + + propagatedBuildInputs = [ + voluptuous + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/balloob/voluptuous-serialize; + license = licenses.asl20; + description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; + maintainers = with maintainers; [ etu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a230853087c..4ec4d12f106b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18129,6 +18129,8 @@ EOF voluptuous = callPackage ../development/python-modules/voluptuous { }; + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + pysigset = callPackage ../development/python-modules/pysigset { }; us = callPackage ../development/python-modules/us { }; From b69d12c5a97f570d5fcccafa4380f13e244edcd5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 31 May 2018 21:43:58 +0200 Subject: [PATCH 17/63] home-assistant: Add dependency used for hue modules --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4d970a7e0d5d..abe57c2d57f9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -402,7 +402,7 @@ "http.real_ip" = ps: with ps; [ ]; "http.static" = ps: with ps; [ ]; "http.view" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue ]; + "hue" = ps: with ps; [ aiohue voluptuous-serialize ]; "hue.bridge" = ps: with ps; [ ]; "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; @@ -459,7 +459,7 @@ "light.hive" = ps: with ps; [ ]; "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; - "light.hue" = ps: with ps; [ aiohue ]; + "light.hue" = ps: with ps; [ aiohue voluptuous-serialize ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; "light.ihc" = ps: with ps; [ ]; From eca586e0e83a624b31c6b3ce91cf591453380952 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2018 02:30:35 +0200 Subject: [PATCH 18/63] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/fd2c3d3b576b746cfeacd2ab2e6b38b4039df2f6. --- .../haskell-modules/hackage-packages.nix | 1961 ++++++++++++++--- 1 file changed, 1656 insertions(+), 305 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 928829c8701c..3345cade70b5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -759,6 +759,50 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_4" = callPackage + ({ mkDerivation, alex, array, async, base, binary, blaze-html + , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq + , directory, EdisonCore, edit-distance, emacs, equivalence + , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables + , haskeline, ieee754, mtl, murmur-hash, pretty, process, regex-tdfa + , stm, strict, template-haskell, text, time, transformers + , unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.4"; + sha256 = "02cyq1wpnllzcwdb45gk3hq7hha2090ay6m16qg7fq9467ip22dl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath process ]; + libraryHaskellDepends = [ + array async base binary blaze-html boxes bytestring containers + data-hash deepseq directory EdisonCore edit-distance equivalence + filepath geniplate-mirror gitrev hashable hashtables haskeline + ieee754 mtl murmur-hash pretty process regex-tdfa stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex cpphs happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -9815,6 +9859,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.14"; + sha256 = "12blnh5x69wvhw1lx3vk14lm1klhqblgd539ffqnrg2dn9qh4ga4"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -9889,6 +9948,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HsYAML" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, mtl, parsec + , text + }: + mkDerivation { + pname = "HsYAML"; + version = "0.1.0.0"; + sha256 = "1vl2fsbs0grgjwcghzqsiijnl7qlv2fgfw2nk9sbcfp81y0bxy3c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dlist mtl parsec text + ]; + description = "Pure Haskell YAML 1.2 parser"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Hsed" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor , data-accessor-template, data-accessor-transformers, directory @@ -11400,6 +11476,8 @@ self: { pname = "List"; version = "0.6.2"; sha256 = "0y5qk6pzpcha01pa9133qgmmk9nkgjqxaxlg04993i9g43hjpff4"; + revision = "1"; + editedCabalFile = "11ws93cdzz7k4nvcld2d74155mdgcvyi6f6an7gpf9z4k523c11n"; libraryHaskellDepends = [ base transformers ]; description = "List monad transformer and class"; license = stdenv.lib.licenses.bsd3; @@ -14259,8 +14337,8 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "1.1"; - sha256 = "1jyq159w7lpdgk0i6biqifdqf93jqla790lyix3qx7717r98kkav"; + version = "1.1.2"; + sha256 = "1p9nsq0rx1fh8v3cm809z8xs4877hgvgxygqxi3iq0k7gikninx4"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; @@ -16275,27 +16353,27 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, json, mtl - , parsec, process, QuickCheck, regex-tdfa + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, mtl, parsec, process, QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; - version = "0.4.7"; - sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q"; - revision = "1"; - editedCabalFile = "0fbrysx6wb9kmlzbfyjcb7107rnf0rjldlszaqnpib33vwd7l1hx"; + version = "0.5.0"; + sha256 = "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base containers directory json mtl parsec process QuickCheck - regex-tdfa + aeson base bytestring containers directory mtl parsec process + QuickCheck regex-tdfa ]; executableHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa + aeson base bytestring containers directory mtl parsec QuickCheck + regex-tdfa ]; testHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa + aeson base bytestring containers directory mtl parsec QuickCheck + regex-tdfa ]; description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; @@ -18369,8 +18447,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.10"; - sha256 = "0c7i5y5h2q55nj4wv692zd8hsai998dws3mdqgj5h1065v48r6im"; + version = "0.1.2.11"; + sha256 = "0ggcp3sgqv1m5xs8q87c2n6rms7mypbf3j9f5702qllzyns2r79l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18384,7 +18462,7 @@ self: { testHaskellDepends = [ base HDBC HDBC-sqlite3 hspec mtl QuickCheck webdriver ]; - description = "Villefort is a task manager and time tracker written in haskell"; + description = "Villefort is a task manager and time tracker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -26687,6 +26765,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "animate-frames" = callPackage + ({ mkDerivation, aeson, animate, async, base, bytestring + , containers, JuicyPixels, pureMD5, safe, stm, tasty, tasty-hspec + , text, vector, yaml + }: + mkDerivation { + pname = "animate-frames"; + version = "0.0.1"; + sha256 = "1yjr3w064nm5qi87m4w8xvjpjqry4b6chs5igshwzijrb530chk9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson animate async base bytestring containers JuicyPixels pureMD5 + safe stm text vector yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + description = "Convert sprite frames to animate files"; + license = stdenv.lib.licenses.mit; + }) {}; + "animate-preview" = callPackage ({ mkDerivation, aeson, animate, base, bytestring, containers , filepath, fsnotify, key-state, lens, linear, mtl @@ -27145,6 +27244,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "apart" = callPackage + ({ mkDerivation, base, comonad, contravariant, free, hedgehog, lens + , semigroupoids + }: + mkDerivation { + pname = "apart"; + version = "0.1.0"; + sha256 = "05jpxq68pm1hs05nxz6wd787jmdxf59kd13nmsa89p5qcdh7znqw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base comonad contravariant free hedgehog lens semigroupoids + ]; + executableHaskellDepends = [ + base comonad contravariant free hedgehog lens semigroupoids + ]; + testHaskellDepends = [ + base comonad contravariant free hedgehog lens semigroupoids + ]; + description = "Get all your structure and rip it apart"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apecs" = callPackage ({ mkDerivation, async, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector @@ -28759,8 +28881,8 @@ self: { }: mkDerivation { pname = "arx"; - version = "0.2.3"; - sha256 = "1dlxc36sfsk0mc196v9z0kzgbz9qg2ln8ds8d2lmvi8zqyl9v0ha"; + version = "0.3.1"; + sha256 = "1wfxazj1qavk366vi9b65iyf5r16bp3xdzdas08ipaba3f91mx37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30022,8 +30144,8 @@ self: { }: mkDerivation { pname = "ats-storable"; - version = "0.3.0.3"; - sha256 = "1a9id432vhvr3n69m1f7iyc899nc2wa4w8jpa7s7aqkixw2vqlr2"; + version = "0.3.0.4"; + sha256 = "0yjbhlxnrprdvf0k93j0w4dpbr55pdcxcs1jhw4b7ngd64a6nvw5"; libraryHaskellDepends = [ base bytestring composition-prelude text ]; @@ -31726,6 +31848,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "axiom_0_4_7" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , ghcjs-perch, mtl, transformers, transient, transient-universe + }: + mkDerivation { + pname = "axiom"; + version = "0.4.7"; + sha256 = "14vdmkyfqn2i5ibc9d6nfhi5hqbk1552x8paq2x0yvsng4kj228x"; + libraryHaskellDepends = [ + base bytestring containers directory ghcjs-perch mtl transformers + transient transient-universe + ]; + description = "Web EDSL for running in browsers and server nodes using transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "axiomatic-classes" = callPackage ({ mkDerivation, base, containers, control-invariants, lens , monad-loops, mtl, portable-template-haskell-lens, QuickCheck @@ -31906,6 +32045,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "b9_0_5_49" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors + , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile + , directory, filepath, free, hashable, hspec, hspec-expectations + , lens, mtl, optparse-applicative, parallel, parsec, pretty + , pretty-show, process, QuickCheck, random, shake, syb, template + , text, time, transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "b9"; + version = "0.5.49"; + sha256 = "0n9vci1wc2ws4nyzmmqi2npwkd3zz28znyqj4905y1hc126x0yi3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base base64-bytestring bifunctors binary boxes + bytestring conduit conduit-extra ConfigFile directory filepath free + hashable lens mtl parallel parsec pretty pretty-show process + QuickCheck random shake syb template text time transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base bytestring directory lens optparse-applicative + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations QuickCheck text + unordered-containers vector yaml + ]; + description = "A tool and library for building virtual machine images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "babl" = callPackage ({ mkDerivation, babl, base }: mkDerivation { @@ -32806,29 +32978,32 @@ self: { "baserock-schema" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors - , hspec, mtl, QuickCheck, text, transformers, turtle, yaml + , gitlab-api, hspec, lens, mtl, QuickCheck, text, transformers + , turtle, unordered-containers, yaml }: mkDerivation { pname = "baserock-schema"; - version = "0.0.1.3"; - sha256 = "1p6q6g61cbmsl7ppfqcs5jn0z17aya4sqp7gdi4y01msgd81cvcc"; + version = "0.0.1.5"; + sha256 = "0dc9wsdxgp0jx7mnq0c1dx48y6khjr9zjg3wjlifyx3k3k7yn2i5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - algebraic-graphs base bytestring errors mtl text transformers - turtle yaml + algebraic-graphs base bytestring errors lens mtl text transformers + turtle unordered-containers yaml ]; executableHaskellDepends = [ - algebraic-graphs base bytestring docopt errors mtl text - transformers turtle yaml + algebraic-graphs base bytestring docopt errors gitlab-api lens mtl + text transformers turtle unordered-containers yaml ]; testHaskellDepends = [ - algebraic-graphs base bytestring errors hspec mtl QuickCheck text - transformers turtle yaml + algebraic-graphs base bytestring errors hspec lens mtl QuickCheck + text transformers turtle unordered-containers yaml ]; description = "Baserock Definitions Schema"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {gitlab-api = null;}; "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: @@ -34331,23 +34506,28 @@ self: { }) {}; "binary-ext" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , directory, filepath, HUnit, QuickCheck, random, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, attoparsec, base, binary, bytestring, conduit + , conduit-combinators, data-binary-ieee754, errors, exceptions + , HUnit, monad-control, monad-loops, mono-traversable, mtl + , scientific, text, transformers, transformers-base }: mkDerivation { pname = "binary-ext"; - version = "1.0.8.5.1"; - sha256 = "166c0wvmjpgpsm5s93clkp0ba50xyxinma4bkjxwqz3x1iv0gvzb"; + version = "2.0.4"; + sha256 = "026y58an12p6cmpxhs3qrwl6w4q3i6i47svcj5qz5mi6vsdy2n3f"; libraryHaskellDepends = [ - array base binary bytestring containers + attoparsec base binary bytestring conduit conduit-combinators + data-binary-ieee754 errors exceptions monad-control monad-loops + mono-traversable mtl scientific text transformers transformers-base ]; testHaskellDepends = [ - array base binary bytestring Cabal containers directory filepath - HUnit QuickCheck random test-framework test-framework-quickcheck2 + attoparsec base binary bytestring conduit conduit-combinators + data-binary-ieee754 errors exceptions HUnit monad-control + monad-loops mono-traversable mtl scientific text transformers + transformers-base ]; - description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library."; - license = stdenv.lib.licenses.bsd3; + description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package."; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -35780,8 +35960,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.5.0"; - sha256 = "1nb549w2rzc9psdnz8xbma0qgm2hj4svrlm3x8vc2i1dklmljmvr"; + version = "0.5.1"; + sha256 = "1lpcbzapinfbd7s4hz2yj3nwp1hm4fy514hqnqil4ijndyknlk3n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing @@ -36980,8 +37160,8 @@ self: { }: mkDerivation { pname = "blaze-colonnade"; - version = "1.2.1"; - sha256 = "0bsax9fw3bmj32a0dsrmp7zrpfp2pgilq3nss6qfa1zh1kdyj1xy"; + version = "1.2.2"; + sha256 = "0k51iqfr2dvc445q6jzvf4mb3q3x4z0vvf9p8fhd4npazwb72bqz"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text ]; @@ -37715,6 +37895,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "boltzmann-brain" = callPackage + ({ mkDerivation, array, base, containers, haskell-src-exts, hmatrix + , megaparsec, mtl, multiset, process + }: + mkDerivation { + pname = "boltzmann-brain"; + version = "1.3.1.3"; + sha256 = "1qv0s70bvn0zgmyb2bccw64d377pb6m0xjzqq7lsz8nzk86wqhzs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers haskell-src-exts hmatrix megaparsec mtl + multiset process + ]; + executableHaskellDepends = [ base containers hmatrix ]; + description = "Boltzmann sampler compiler for combinatorial systems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boltzmann-samplers" = callPackage ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 , MonadRandom, mtl, QuickCheck, transformers, unordered-containers @@ -37734,28 +37933,29 @@ self: { "bond" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring - , cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops - , mtl, parsec, pretty, process, QuickCheck, scientific, shakespeare - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + , cmdargs, derive, Diff, directory, filepath, HUnit, megaparsec + , monad-loops, mtl, pretty, process, QuickCheck, scientific + , shakespeare, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , text, unordered-containers }: mkDerivation { pname = "bond"; - version = "0.10.1.0"; - sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c"; + version = "0.11.0.3"; + sha256 = "1zarrlhcp8q1impikmqsz8mnaxi8l8b4nl02qp8xm6y6gpbyhaqj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring filepath mtl parsec scientific shakespeare - text + aeson base bytestring filepath megaparsec mtl scientific + shakespeare text unordered-containers ]; executableHaskellDepends = [ - aeson async base bytestring cmdargs directory filepath monad-loops - parsec process text + aeson async base bytestring cmdargs directory filepath megaparsec + monad-loops process text ]; testHaskellDepends = [ aeson aeson-pretty base bytestring cmdargs derive Diff directory - filepath HUnit monad-loops parsec pretty QuickCheck tasty - tasty-golden tasty-hunit tasty-quickcheck text + filepath HUnit megaparsec monad-loops pretty QuickCheck shakespeare + tasty tasty-golden tasty-hunit tasty-quickcheck text ]; description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; @@ -38004,8 +38204,8 @@ self: { }: mkDerivation { pname = "boomange"; - version = "0.1.3.5"; - sha256 = "017klwzi30qmrvxy19i8swnmgzxfimq9q647kvw001yx9nsf204n"; + version = "0.1.3.6"; + sha256 = "0gdhvxjcbyzhxvrgzk70jaihgkxa03ycg4bls03rgnqy773p07f1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -39253,6 +39453,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "build" = callPackage + ({ mkDerivation, algebraic-graphs, base, containers, extra + , filepath, mtl, random, transformers + }: + mkDerivation { + pname = "build"; + version = "0.0.1.1"; + sha256 = "1p3814if20x9prd7m3q414v9a1c735bxzgblp55lb9bbsaja7zyl"; + libraryHaskellDepends = [ + algebraic-graphs base containers extra filepath mtl random + transformers + ]; + testHaskellDepends = [ base containers extra mtl transformers ]; + description = "Build systems a la carte"; + license = stdenv.lib.licenses.mit; + }) {}; + "buildable" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { @@ -41045,6 +41262,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_12_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.12.4"; + sha256 = "1wzsbnm57wc38ppqh8fdp8qnqxham5qia96qlgya4b2wh3q6d932"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit process time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43368,6 +43604,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ccast" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "ccast"; + version = "0.1.0.0"; + sha256 = "1yls8b1kjmdc8gh1i4vaaav1sgvfccyjfqxjpvb7gw27ivma3v7l"; + libraryHaskellDepends = [ base template-haskell ]; + description = "typesafe c-style casts; useful for FFI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cci" = callPackage ({ mkDerivation, base, binary, bytestring, cci, cmdargs, containers , filepath, mtl, pretty, process, random, time @@ -45442,6 +45689,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cl3" = callPackage + ({ mkDerivation, base, criterion, QuickCheck, random }: + mkDerivation { + pname = "cl3"; + version = "1.0.0.0"; + sha256 = "1a15nbx0q260bs5bh10vckvlbzfgjs5f676r3drki77hggkidvjh"; + libraryHaskellDepends = [ base random ]; + testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Clifford Algebra of three dimensional space"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cl3-hmatrix-interface" = callPackage + ({ mkDerivation, base, cl3, hmatrix }: + mkDerivation { + pname = "cl3-hmatrix-interface"; + version = "1.0.0.0"; + sha256 = "0cz1pzbnxld2kpiqggln0yags46zhlc8pzghz3mykblwdvgk7z7s"; + libraryHaskellDepends = [ base cl3 hmatrix ]; + description = "Interface to/from Cl3 and HMatrix"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cl3-linear-interface" = callPackage + ({ mkDerivation, base, cl3, linear }: + mkDerivation { + pname = "cl3-linear-interface"; + version = "1.0.0.0"; + sha256 = "02yyajy8n9j7jd3kz2qas4h2vyv5b42jrjj092cy18lfj9hr22as"; + libraryHaskellDepends = [ base cl3 linear ]; + description = "Interface to/from Cl3 and Linear"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clac" = callPackage ({ mkDerivation, base, containers, dsp, optparse-applicative , plailude, pretty-tree, safe, split @@ -47564,10 +47846,8 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.2.2.1"; - sha256 = "0vb3v8d4jdzk14zs1jv4m5f2wa32bpxsfa0zr4f3w6z77as136sx"; - revision = "2"; - editedCabalFile = "0glp45kr9v8c9pxbaaq6cwm6i5rhglw2npk16kab80dgsfdb1pj9"; + version = "0.2.3"; + sha256 = "0rn4lzjrw930phg62pmrziq4g3dv7rjzxxfsnz11k46w845zzgih"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers hashable mtl random random-shuffle text time @@ -48745,8 +49025,8 @@ self: { }: mkDerivation { pname = "compactable"; - version = "0.1.2.0"; - sha256 = "0kh36h1zfdlhvcz8xzf3c4af0rbypa7p421rl0xsig914r5z519j"; + version = "0.1.2.1"; + sha256 = "00fxrwyn1znyhfpql2ygh308b7nl6a3lgxvl39q3qm89wzh2gisc"; libraryHaskellDepends = [ base bifunctors containers transformers vector ]; @@ -49214,12 +49494,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_4_0_5" = callPackage + "composition-prelude_1_5_0_0" = callPackage ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.4.0.5"; - sha256 = "0bcz7lx4v25dz9d11qy8im6fk1gviqqhgcr1bwxg4yqyzbfl8bas"; + version = "1.5.0.0"; + sha256 = "01rbbqnwmm615af1yrg4afk4dvv24y2k52m6c1rz9xkyyg8ii0hq"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; description = "Higher-order function combinators"; @@ -50032,6 +50312,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conduit-algorithms_0_0_8_1" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, containers, criterion + , deepseq, directory, exceptions, HUnit, lzma-conduit + , monad-control, mtl, pqueue, resourcet, stm, stm-conduit + , streaming-commons, test-framework, test-framework-hunit + , test-framework-th, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.8.1"; + sha256 = "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq exceptions lzma-conduit + monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory exceptions HUnit + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons test-framework test-framework-hunit + test-framework-th transformers unliftio-core vector + ]; + benchmarkHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers criterion deepseq exceptions lzma-conduit + monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -51062,8 +51378,8 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "constrictor"; - version = "0.1.1.2"; - sha256 = "0cqnc0hd73wjmmv9qcvakgg36mhxxp5f9wv2jh3nc45bxjd91snq"; + version = "0.1.2.0"; + sha256 = "17vdyc2r9fgblh2pjwdrya7iyrb83ay09zhpfvn80rrrj3d2nd8x"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "strict versions of many things in base"; license = stdenv.lib.licenses.mit; @@ -51332,6 +51648,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "contiguous" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "contiguous"; + version = "0.1.0.0"; + sha256 = "19j58q0iq8ghhvrz6hqh4k7biiw8nnnxd2q3b3gwnlgfv08g8h7b"; + libraryHaskellDepends = [ base primitive ]; + description = "Unified interface for primitive arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "continue" = callPackage ({ mkDerivation, base, bifunctors, monad-control, mtl , semigroupoids, transformers, transformers-base @@ -51477,8 +51804,8 @@ self: { }: mkDerivation { pname = "control-iso"; - version = "0.1.0.0"; - sha256 = "1z4z3plxs06w485injj2azk8bl42wy0i6c65c4j7fzkkyk7pqbfj"; + version = "0.1.0.1"; + sha256 = "1346x6fmdizqi7mxv13z97yjb58psga9mk0rqc6144fgk5i9y9v1"; libraryHaskellDepends = [ base bytestring newtype-generics profunctors text ]; @@ -56579,14 +56906,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_4_1_0_0" = callPackage + "data-diverse-lens_4_2_0_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "4.1.0.0"; - sha256 = "1kzmxlrnvz0xl4fvdgi9qm0vdkwh8129x5af9cjcji5rhmshh5bh"; + version = "4.2.0.0"; + sha256 = "0skjgkv81sjmpggk57ac33f84qv0in04hnwyy23zk9g9cbqz0qwr"; libraryHaskellDepends = [ base data-diverse data-has lens profunctors tagged ]; @@ -59384,14 +59711,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_6_0_0" = callPackage + "dejafu_1_8_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.6.0.0"; - sha256 = "101lbnan5cgyl6v6j4hbys8j8br814m14clxgc366yyd2rkf8saf"; + version = "1.8.0.0"; + sha256 = "09l1z86vzccvbmsbar5q2a9zc7i8qh8ykinfhvrzcir1yhyz422i"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -59993,8 +60320,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "descrilo"; - version = "0.1.0.5"; - sha256 = "13pmncbss1fwzc8n37rc7czdpjh12iim5nc10p0486ka5asxcc95"; + version = "0.1.0.6"; + sha256 = "166x7j8q5wg8iq1bf2qz01ps0b1pbfgizsy1zfhjd98a3zl9fid2"; libraryHaskellDepends = [ base ]; description = "Loads a list of items with fields"; license = stdenv.lib.licenses.gpl3; @@ -60456,24 +60783,25 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, contravariant , dhall, Diff, filepath, formatting, hashable , insert-ordered-containers, optparse-applicative, prettyprinter - , tasty, tasty-golden, text, transformers, trifecta, vector + , tasty, tasty-golden, text, transformers, vector }: mkDerivation { pname = "dhall-to-cabal"; - version = "1.0.0.1"; - sha256 = "0qs00xhsk09azm7sqfihnwmapilmkybmcim1wzlw3h6y4jj6nmq9"; + version = "1.1.0.0"; + sha256 = "1vmyc9pbcndqimh2wpdwbnnzjkgkqahq13migasbj8p96ck1kbcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers dhall formatting hashable - insert-ordered-containers text transformers trifecta vector + base bytestring Cabal containers contravariant dhall formatting + hashable insert-ordered-containers text transformers vector ]; executableHaskellDepends = [ - base Cabal contravariant dhall hashable insert-ordered-containers - optparse-applicative prettyprinter text + base bytestring Cabal dhall insert-ordered-containers + optparse-applicative prettyprinter text transformers ]; testHaskellDepends = [ - base bytestring Cabal Diff filepath tasty tasty-golden text + base bytestring Cabal dhall Diff filepath prettyprinter tasty + tasty-golden text ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; @@ -60872,8 +61200,8 @@ self: { }: mkDerivation { pname = "diagrams-html5"; - version = "1.4"; - sha256 = "1an1f7ykimjbi9xir3mac34ikkawnvs96bpnzp8ia8jcdaa3qra3"; + version = "1.4.1"; + sha256 = "0vp99ks9ldy91x1jlla0kyg8sq9748k82ql0jsf0jxhimvwd7vp8"; libraryHaskellDepends = [ base cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative split @@ -62501,6 +62829,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributed-fork" = callPackage + ({ mkDerivation, async, base, binary, bytestring, constraints + , distributed-closure, exceptions, stm, tasty, tasty-hunit + , terminal-size, text, transformers, typed-process, unix + }: + mkDerivation { + pname = "distributed-fork"; + version = "0.0.1.2"; + sha256 = "0sdabc688fm1xajrdr9q6wzxd2fhzs9ary07sxh2sx0dwlyzk773"; + libraryHaskellDepends = [ + async base binary bytestring constraints distributed-closure + exceptions stm terminal-size text transformers typed-process + ]; + testHaskellDepends = [ base tasty tasty-hunit unix ]; + description = "Like 'forkIO', but uses remote machines instead of local threads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "distributed-fork-aws-lambda" = callPackage + ({ mkDerivation, aeson, aeson-qq, amazonka, amazonka-cloudformation + , amazonka-core, amazonka-lambda, amazonka-s3, amazonka-sqs, async + , base, base64-bytestring, bytestring, containers, distributed-fork + , interpolate, lens, lens-aeson, safe-exceptions, SHA, stratosphere + , tasty, tasty-hunit, text, time, typed-process + , unordered-containers, zip-archive + }: + mkDerivation { + pname = "distributed-fork-aws-lambda"; + version = "0.0.1.2"; + sha256 = "1y511vildwj2f6kcswwqw65xhv06q106pnnv1pnhjc91x7r7sbzm"; + libraryHaskellDepends = [ + aeson aeson-qq amazonka amazonka-cloudformation amazonka-core + amazonka-lambda amazonka-s3 amazonka-sqs async base + base64-bytestring bytestring containers distributed-fork + interpolate lens lens-aeson safe-exceptions SHA stratosphere text + time typed-process unordered-containers zip-archive + ]; + testHaskellDepends = [ + base distributed-fork tasty tasty-hunit text + ]; + description = "AWS Lambda backend for distributed-fork"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-process" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-accessor, deepseq, distributed-static, exceptions, hashable @@ -68919,6 +69291,62 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "espial" = callPackage + ({ mkDerivation, aeson, base, bcrypt, bytestring, case-insensitive + , classy-prelude, classy-prelude-conduit, classy-prelude-yesod + , conduit, containers, data-default, directory, esqueleto + , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec + , http-conduit, iso8601-time, microlens, monad-control + , monad-logger, mtl, optparse-generic, persistent + , persistent-sqlite, persistent-template, pretty-show, safe + , shakespeare, template-haskell, text, time, transformers + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static + , yesod-test + }: + mkDerivation { + pname = "espial"; + version = "0.0.1"; + sha256 = "19zkd2vki74ny69w2bdc3qr71fzawk20a56vsv3an9q5xx0f36a6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bcrypt bytestring case-insensitive classy-prelude + classy-prelude-conduit classy-prelude-yesod conduit containers + data-default directory esqueleto fast-logger file-embed + foreign-store hjsmin hscolour http-conduit iso8601-time + monad-control monad-logger mtl persistent persistent-sqlite + persistent-template pretty-show safe shakespeare template-haskell + text time transformers unordered-containers vector wai wai-extra + wai-logger warp yaml yesod yesod-auth yesod-core yesod-form + yesod-static + ]; + executableHaskellDepends = [ + aeson base bcrypt bytestring case-insensitive classy-prelude + classy-prelude-conduit classy-prelude-yesod conduit containers + data-default directory esqueleto fast-logger file-embed + foreign-store hjsmin hscolour http-conduit iso8601-time + monad-control monad-logger mtl optparse-generic persistent + persistent-sqlite persistent-template pretty-show safe shakespeare + template-haskell text time transformers unordered-containers vector + wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core + yesod-form yesod-static + ]; + testHaskellDepends = [ + aeson base bcrypt bytestring case-insensitive classy-prelude + classy-prelude-conduit classy-prelude-yesod conduit containers + data-default directory esqueleto fast-logger file-embed + foreign-store hjsmin hscolour hspec http-conduit iso8601-time + microlens monad-control monad-logger mtl persistent + persistent-sqlite persistent-template pretty-show safe shakespeare + template-haskell text time transformers unordered-containers vector + wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core + yesod-form yesod-static yesod-test + ]; + description = "Espial is an open-source, web-based bookmarking server"; + license = stdenv.lib.licenses.mit; + }) {}; + "esqueleto" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers , hspec, HUnit, monad-control, monad-logger, persistent @@ -69009,8 +69437,8 @@ self: { }: mkDerivation { pname = "etc"; - version = "0.4.0.1"; - sha256 = "0vpc3816vsxs985h076wxyr3z9q759399xapnhiv1m428sksw6zs"; + version = "0.4.0.3"; + sha256 = "0xnm5mvrd0409kcrxp6ls92z5fvq959pghf67pqmj4a84k1dwkw3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hashable rio text typed-process unliftio @@ -70315,8 +70743,8 @@ self: { }: mkDerivation { pname = "exinst"; - version = "0.5"; - sha256 = "1r6hy9kkfn24zszb9jd4p6w3wa4nwd2ds8mvb3k9rl20gc3zzhhi"; + version = "0.6"; + sha256 = "0pljgk0y4azzgp0k9q8dl7jpf9bf2719xax54mnc35g1px4s21p9"; libraryHaskellDepends = [ aeson base binary bytes cborg cereal constraints deepseq hashable profunctors QuickCheck serialise singletons @@ -71444,8 +71872,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.0.6"; - sha256 = "1vw652sps7dx11anqrrjw2fz039m7bkcfmk61px9g3yn0wvjlm02"; + version = "0.6.0.7"; + sha256 = "12ma6p4qy7wc22dd63dxqq3sq7spsx2hdzn82zf0w9y33y2jyaml"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; @@ -73069,6 +73497,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filecache_0_4_0" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, filepath + , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time + }: + mkDerivation { + pname = "filecache"; + version = "0.4.0"; + sha256 = "0x2ffqx6wfv6n3k3396463f771zs9ps1rcw8ga3qw4vm5sv8s26d"; + libraryHaskellDepends = [ + base containers directory exceptions filepath fsnotify mtl stm + strict-base-types time + ]; + testHaskellDepends = [ + base containers directory filepath hspec stm temporary + ]; + description = "A cache system associating values to files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filediff" = callPackage ({ mkDerivation, base, bytestring, data-default , data-memocombinators, directory, either, hashmap, mtl, rainbow @@ -75498,15 +75946,15 @@ self: { }) {}; "forest" = callPackage - ({ mkDerivation, aeson, base, deepseq, hashable, profunctors - , semigroupoids + ({ mkDerivation, aeson, base, comonad, deepseq, free, hashable + , profunctors, semigroupoids }: mkDerivation { pname = "forest"; - version = "0.2"; - sha256 = "0z8wfvylzcls994yg3s4bywjxl3592y4ba6gcn2h8ndc7c8w09v4"; + version = "0.2.1"; + sha256 = "1kj84w39bxirasa5m2y9zjgsq7cd6yv82y51g8cr9g7r1z30wri8"; libraryHaskellDepends = [ - aeson base deepseq hashable profunctors semigroupoids + aeson base comonad deepseq free hashable profunctors semigroupoids ]; description = "Tree and Forest types"; license = stdenv.lib.licenses.mpl20; @@ -77066,15 +77514,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fsnotify_0_3_0_0" = callPackage + "fsnotify_0_3_0_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , filepath, hinotify, random, shelly, tasty, tasty-hunit, temporary , text, time, unix, unix-compat }: mkDerivation { pname = "fsnotify"; - version = "0.3.0.0"; - sha256 = "1ni5zmrbc255raxn4ws20n6b1n89yyjxrf96d1fs8y74h3z4ny85"; + version = "0.3.0.1"; + sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny"; + revision = "1"; + editedCabalFile = "1pa9pa0kflkqlb4dysagy0aihn452hmf6wwlsr7fp4ygg86m7fsq"; libraryHaskellDepends = [ async base bytestring containers directory filepath hinotify shelly text time unix unix-compat @@ -77108,6 +77558,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fsnotify-conduit_0_1_1_1" = callPackage + ({ mkDerivation, base, conduit, directory, filepath, fsnotify + , hspec, resourcet, temporary, transformers + }: + mkDerivation { + pname = "fsnotify-conduit"; + version = "0.1.1.1"; + sha256 = "1kh1y1p4dw2yhxrl1rrkmpkvm3q5nq12cwl8dfcscrkx3wqhz683"; + libraryHaskellDepends = [ + base conduit directory filepath fsnotify resourcet transformers + ]; + testHaskellDepends = [ + base conduit directory filepath fsnotify hspec resourcet temporary + transformers + ]; + description = "Get filesystem notifications as a stream of events"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fst" = callPackage ({ mkDerivation, array, base, haskeline, mtl, QuickCheck , transformers @@ -77165,8 +77635,8 @@ self: { }: mkDerivation { pname = "fswatch"; - version = "0.1.0.2"; - sha256 = "1k3592nfiy348aqg2q64k3w1vbzl7x7098jy73gp7ipzyfr9k1pp"; + version = "0.1.0.3"; + sha256 = "1k68h4jzcqsnmmhnm3sp0zlkz99q0d925iragl3dbnsbk837sq25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79088,6 +79558,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-random_1_2_0_0" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "1.2.0.0"; + sha256 = "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Generic random generators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-records" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79828,6 +80311,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-mergeless" = callPackage + ({ mkDerivation, base, containers, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-aeson, genvalidity-time, genvalidity-typed-uuid + , hspec, mergeless, mtl, QuickCheck, random, time, typed-uuid, uuid + }: + mkDerivation { + pname = "genvalidity-mergeless"; + version = "0.0.0.0"; + sha256 = "08lic96xmyqxi773zynn361yzqkx13w57hd7jl21hbkpjjx1g9ka"; + libraryHaskellDepends = [ + base genvalidity genvalidity-containers genvalidity-time mergeless + QuickCheck + ]; + testHaskellDepends = [ + base containers genvalidity-hspec genvalidity-hspec-aeson + genvalidity-typed-uuid hspec mergeless mtl QuickCheck random time + typed-uuid uuid + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {genvalidity-typed-uuid = null; typed-uuid = null;}; + "genvalidity-path" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path , validity-path @@ -81709,6 +82216,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcjs-base-stub_0_2_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, containers, deepseq + , ghc-prim, primitive, scientific, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "ghcjs-base-stub"; + version = "0.2.0.0"; + sha256 = "05k59a6jg1a5s8zvqfah5rvm5kg34sqpv2zx4chczihx3n9prfv7"; + libraryHaskellDepends = [ + aeson attoparsec base containers deepseq ghc-prim primitive + scientific text transformers unordered-containers vector + ]; + description = "Allow GHCJS projects to compile under GHC and develop using intero"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-codemirror" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -82050,25 +82575,25 @@ self: { "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk - , haskell-gi, haskell-gi-base, haskell-gi-overloading + , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading , libdbusmenu-gtk3, text, transformers }: mkDerivation { pname = "gi-dbusmenugtk3"; - version = "0.4.1"; - sha256 = "0gl37jsska2qsakzbmvwvb33lskdrbxpk1hmw907y187d0hq7pry"; + version = "0.4.2"; + sha256 = "0wflxyicav2p1z2sqdrjpvkf4blsilg7psvbr0cfl0r7vmy6nx4w"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libdbusmenu-gtk3 ]; + libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libdbusmenu-gtk3;}; + }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -82942,8 +83467,8 @@ self: { }: mkDerivation { pname = "git-all"; - version = "1.5.0"; - sha256 = "0wfvfrmwn81myiaa5x4bw6ypyk0hljaaf3f7b9rnpxwk291dwc3z"; + version = "1.6.0"; + sha256 = "10fq88fld1lb5wrikcsg9gxcfbldr0fpix81sba8qy11g7igd7fl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82977,8 +83502,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180509"; - sha256 = "09rl41c7fsz9jzf9234qcqfix61afxyc2vjx6sld2zyqiky7rhvh"; + version = "6.20180529"; + sha256 = "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83070,13 +83595,16 @@ self: { "git-date" = callPackage ({ mkDerivation, base, bytestring, old-locale, QuickCheck - , test-framework, test-framework-quickcheck2, time, utf8-string + , test-framework, test-framework-quickcheck2, time, unexceptionalio + , utf8-string }: mkDerivation { pname = "git-date"; - version = "0.2.2"; - sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl"; - libraryHaskellDepends = [ base bytestring time utf8-string ]; + version = "0.3.0"; + sha256 = "1lhmzjfch84nilr89b0qaj4a7nrkkrabimg46rnqpmylbgws1h4m"; + libraryHaskellDepends = [ + base bytestring time unexceptionalio utf8-string + ]; testHaskellDepends = [ base bytestring old-locale QuickCheck test-framework test-framework-quickcheck2 time utf8-string @@ -83720,19 +84248,18 @@ self: { "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath - , hashable, lifted-async, lifted-base, monad-control, mtl - , resourcet, semigroups, tagged, text, time, transformers, unix - , unordered-containers + , hashable, mtl, resourcet, semigroups, tagged, text, time + , transformers, unix, unliftio, unliftio-core, unordered-containers }: mkDerivation { pname = "gitlib"; - version = "3.1.1"; - sha256 = "1vwmyfmqlly351jq9pgjhcfhnxvrhzkd4lfq7qpsa37vca5pas6x"; + version = "3.1.2"; + sha256 = "1r973cpkp4h8dfjrkqgyy31a3x4bbqi7zhpck09ix2a9i597b345"; libraryHaskellDepends = [ base base16-bytestring bytestring conduit conduit-combinators - containers directory exceptions filepath hashable lifted-async - lifted-base monad-control mtl resourcet semigroups tagged text time - transformers unix unordered-containers + containers directory exceptions filepath hashable mtl resourcet + semigroups tagged text time transformers unix unliftio + unliftio-core unordered-containers ]; description = "API library for working with Git repositories"; license = stdenv.lib.licenses.mit; @@ -84342,6 +84869,8 @@ self: { pname = "glirc"; version = "2.26"; sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0"; + revision = "1"; + editedCabalFile = "0wbkapxwzlmjcmkp6inm2xj6bghd8nl4a4ddljizm6xvwcpvp75j"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -84915,12 +85444,12 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, gmp, recursion-schemes }: + ({ mkDerivation, base, gmp }: mkDerivation { pname = "gmpint"; - version = "0.1.0.13"; - sha256 = "0n4syarw91367kkvsbn9ag3caiksbplx4grm8q4z96wh39dvb24y"; - libraryHaskellDepends = [ base recursion-schemes ]; + version = "0.1.0.14"; + sha256 = "08a3ksaq1xx8w153v0xd5k7g2b65wgkr1jshj7533pkg59s8zdxs"; + libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; @@ -84984,8 +85513,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.32"; - sha256 = "0b2v7msj54r6dd2w2wd4c8q6wvywnkmyddaa05r990cnbg9l4i9b"; + version = "0.3.41"; + sha256 = "1q3g5yikm0n1q2n98iy1j203fi11hy9cfdm6qgcx2ib3b4b2z613"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90982,8 +91511,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.5"; - sha256 = "0chvf2wvpvbnzf8980sdg9s61c4p100ps7ava85hlr281sng5d60"; + version = "0.5.6"; + sha256 = "0im76n8487q08rmw8bn536qncrdhz9pjir5cxlf2myh7prrrrczs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91824,6 +92353,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_12_3_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptohash, data-default, deepseq, directory + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, text, time, time-locale-compat + , unordered-containers, utillinux, vector, wai, wai-app-static + , warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.12.3.0"; + sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache mtl network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-tdfa resourcet scientific tagsoup text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml + ]; + testToolDepends = [ utillinux ]; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -94817,8 +95384,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.4.0"; - sha256 = "1nzaf9zwqsx1jgspimkig6vhh2d1iz7kc3hr2kixc52sbr7y9iag"; + version = "0.0.5.0"; + sha256 = "1sb6jqq1nfzaycr1cx4an5yaaad3k8ijig7ss0xa6wvjkyc37xqa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -95031,6 +95598,34 @@ self: { }) {inherit (pkgs) glib; inherit (pkgs.gnome3) gobjectIntrospection;}; + "haskell-gi_0_21_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.21.3"; + sha256 = "09smnzg6kqjyb7m281k8w3y6vabws41snp9wkh8449s0ya3ndbn0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; + inherit (pkgs.gnome3) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -101496,6 +102091,8 @@ self: { pname = "hgeometry"; version = "0.6.0.0"; sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij"; + revision = "1"; + editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101976,8 +102573,8 @@ self: { }: mkDerivation { pname = "hifi"; - version = "0.1.4.0"; - sha256 = "0rgmhj1fn0ldyzbscv1q447fbqggqaw3zqxagsn95zq2dqyhrpyl"; + version = "0.1.4.1"; + sha256 = "01bdylz6a58aczaf3b35w6x7ji0hxr6b8sjcqsx2jwnc1vx379ns"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103779,8 +104376,8 @@ self: { }: mkDerivation { pname = "hlrdb"; - version = "0.2.0.0"; - sha256 = "1x7vw2mcwd703dr5mjghsjd04yxwl6z7wzdysgk75i4l7f0lcqfq"; + version = "0.2.0.1"; + sha256 = "0rrpn3gsh2ck3skpc9d6mdprcac8xdxxc71m8y5jfi0yzh6priga"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -111132,6 +111729,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsx-jmacro_7_3_8_1" = callPackage + ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }: + mkDerivation { + pname = "hsx-jmacro"; + version = "7.3.8.1"; + sha256 = "0ndgy5vf5rwgwqya75ny5vbr7hfqwjrdgfgpwf5410bk0603v47i"; + libraryHaskellDepends = [ + base hsp jmacro mtl text wl-pprint-text + ]; + description = "hsp+jmacro support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsx-xhtml" = callPackage ({ mkDerivation, base, hsx, mtl }: mkDerivation { @@ -113114,12 +113725,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_2_0_1" = callPackage + "hunit-dejafu_1_2_0_3" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.1"; - sha256 = "1shkfbn14qfk9bjnrmdn3zz88718jb1m942idg2vl53yfj16ahy9"; + version = "1.2.0.3"; + sha256 = "1qja9warghakl06fv5v7fimb3bqnb38lhs9y264x9hrc7i0nx2xj"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -113185,6 +113796,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hunspell-hs" = callPackage + ({ mkDerivation, base, criterion, hspec, hunspell, stm }: + mkDerivation { + pname = "hunspell-hs"; + version = "0.1.0.0"; + sha256 = "0jiqgs4akny8kcpl3hdkj08hyknw2p0z96dci6lwq2fv5qprj77i"; + libraryHaskellDepends = [ base stm ]; + librarySystemDepends = [ hunspell ]; + testHaskellDepends = [ base hspec stm ]; + testSystemDepends = [ hunspell ]; + benchmarkHaskellDepends = [ base criterion stm ]; + benchmarkSystemDepends = [ hunspell ]; + description = "Hunspell thread-safe FFI bindings for spell checking"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) hunspell;}; + "hunt-searchengine" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring , containers, data-default, data-r-tree, data-stringmap, deepseq @@ -113531,6 +114158,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-dsv" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion + , directory, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base + , lens, mmap, optparse-applicative, resourcet, text, vector, weigh + }: + mkDerivation { + pname = "hw-dsv"; + version = "0.1.0.0"; + sha256 = "1qyqvb4ky4fl0hys1yihn54xxmh1ajnb81szgsv8crh1idvx0fil"; + revision = "1"; + editedCabalFile = "0g99dyjx8vrhm9rdblla1gwd1z1p7fpaddq21y56k5bfg9zjcivw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bits-extra bytestring hw-bits hw-prim hw-rankselect + hw-rankselect-base vector + ]; + executableHaskellDepends = [ + base bits-extra bytestring hedgehog hw-bits hw-prim hw-rankselect + hw-rankselect-base lens optparse-applicative resourcet vector + ]; + testHaskellDepends = [ + base bits-extra bytestring cassava directory hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text + vector weigh + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava criterion directory hw-bits + hw-prim hw-rankselect hw-rankselect-base mmap vector weigh + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-eliasfano" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector , hw-prim, QuickCheck, safe, vector @@ -113605,17 +114267,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-fingertree-strict_0_1_1_0" = callPackage + "hw-fingertree-strict_0_1_1_1" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit , hw-hspec-hedgehog, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "hw-fingertree-strict"; - version = "0.1.1.0"; - sha256 = "0a709kcly1wi3lxznk92bcir29yawv5hz6fxnw2dp1zhdmxqj09q"; - revision = "1"; - editedCabalFile = "06dv0zbxzvayymf2syi3dqcm6q8x9c91yl35z1dgkz36lddqbidh"; + version = "0.1.1.1"; + sha256 = "0s0jz6lynxiaz2h8hr78j05vhswrl6vwhmvdra9a46c3yg7vf9qi"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck @@ -113964,6 +114624,8 @@ self: { pname = "hw-rankselect"; version = "0.10.0.3"; sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da"; + revision = "1"; + editedCabalFile = "1rkni89h3sq02y03phb2bgx4yrx4gly9mzan6r4ziph0qayf09wf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113995,6 +114657,8 @@ self: { pname = "hw-rankselect"; version = "0.12.0.2"; sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk"; + revision = "1"; + editedCabalFile = "0wggs7k8b0syivi3lyz6qplkiqb11im94bqhhbn6dqikf5sv6qv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117630,6 +118294,8 @@ self: { pname = "ini"; version = "0.3.6"; sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw"; + revision = "1"; + editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l"; libraryHaskellDepends = [ attoparsec base text unordered-containers ]; @@ -118547,6 +119213,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "interprocess" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "interprocess"; + version = "0.1.0.0"; + sha256 = "13bxwgzbqb2ih76j5il5l6fqaq9lxl7c6h7r0y6hlpzm9f9izcpa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + description = "Shared memory and control structures for IPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "interruptible" = callPackage ({ mkDerivation, base, Cabal, either, lifted-base, monad-control , transformers @@ -118783,6 +119462,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "invertible-grammar" = callPackage + ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter + , profunctors, semigroups, tagged, template-haskell, text + , transformers + }: + mkDerivation { + pname = "invertible-grammar"; + version = "0.1.0"; + sha256 = "0wi0s07v95yh1bmhc4z6n5r47mbmg0mvf3a3ks999gdma4sva1iz"; + libraryHaskellDepends = [ + base bifunctors containers mtl prettyprinter profunctors semigroups + tagged template-haskell text transformers + ]; + description = "Invertible parsing combinators framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "invertible-hlist" = callPackage ({ mkDerivation, base, HList, invertible }: mkDerivation { @@ -120651,6 +121347,8 @@ self: { pname = "jailbreak-cabal"; version = "1.3.3"; sha256 = "076h7nbf94zfwvfijcpv03r3s2nyynb2y9v354m4bxqz3anhib3b"; + revision = "3"; + editedCabalFile = "0f4gqssh2ayl089zzl8m5rwa66x430dg1q5hfwcfd56r6xr6wi1l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; @@ -123373,8 +124071,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.5.0"; - sha256 = "10s2bv79shvnpkz1zbcn220mxv05xxq5gny332vhrhflnlcsq9jr"; + version = "0.5.5.1"; + sha256 = "0q72kjjrn6x1qr2rp6c3mhf5s3cq4pdsl917a9bflid9zmk5n30b"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -125865,8 +126563,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.10"; - sha256 = "1998i63gn8f5pn4jlkv30869679jab0vz0gvjzr4yqlyq4npsvpy"; + version = "1.2.0.11"; + sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -125942,6 +126640,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_8" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.8"; + sha256 = "0ms0hfg65d7phfr2dq6183vcbmq9ddpvmlqbs8nwbqhqvcdpfl4w"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath pretty + process syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -126106,22 +126823,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_5_0_1" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, free, Glob - , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split - , template-haskell, text, th-lift, time + "language-docker_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process + , QuickCheck, split, template-haskell, text, th-lift, time }: mkDerivation { pname = "language-docker"; - version = "5.0.1"; - sha256 = "0y2kb2g9w34p3yw8cdjr4f0xkq9j065khlk1mbk7061gg2rhpykv"; + version = "6.0.0"; + sha256 = "0b3m6vzfhypwqnlwdy1b1cx6dfca0rcq2m4zivd608ny2ii22ajv"; libraryHaskellDepends = [ - base bytestring free mtl parsec pretty split template-haskell text - th-lift time + base bytestring containers free megaparsec mtl prettyprinter split + template-haskell text th-lift time ]; testHaskellDepends = [ - base bytestring directory filepath free Glob hspec HUnit mtl parsec - pretty process QuickCheck split template-haskell text th-lift time + base bytestring containers directory filepath free Glob hspec HUnit + megaparsec mtl prettyprinter process QuickCheck split + template-haskell text th-lift time ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; @@ -126195,7 +126913,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-ecmascript_0_18" = callPackage + "language-ecmascript_0_19" = callPackage ({ mkDerivation, ansi-wl-pprint, base, charset, containers , data-default-class, Diff, directory, filepath, HUnit, mtl, parsec , QuickCheck, template-haskell, test-framework @@ -126204,16 +126922,17 @@ self: { }: mkDerivation { pname = "language-ecmascript"; - version = "0.18"; - sha256 = "0gg608hniq1v7f1d56akyk44zyrmd0acr33m53cbdlcq8w1c8h70"; + version = "0.19"; + sha256 = "13v5ghw8qc4paacn34skgwmvwisjaykszwjrq3lk4idzvrxln2jp"; libraryHaskellDepends = [ ansi-wl-pprint base charset containers data-default-class Diff mtl - parsec QuickCheck template-haskell testing-feat uniplate + parsec QuickCheck template-haskell uniplate ]; testHaskellDepends = [ - ansi-wl-pprint base containers data-default-class Diff directory - filepath HUnit mtl parsec QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 uniplate + ansi-wl-pprint base charset containers data-default-class Diff + directory filepath HUnit mtl parsec QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 testing-feat + uniplate ]; description = "JavaScript parser and pretty-printer library"; license = stdenv.lib.licenses.bsd3; @@ -129794,8 +130513,8 @@ self: { }: mkDerivation { pname = "limp"; - version = "0.3.2.1"; - sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk"; + version = "0.3.2.2"; + sha256 = "0dx2xgkrqda8qwfiwm3pd5lfnfw5sxf1qdz5sbp54jf6516m2c4w"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th @@ -129806,14 +130525,18 @@ self: { }) {}; "limp-cbc" = callPackage - ({ mkDerivation, base, c2hs, containers, limp, vector }: + ({ mkDerivation, base, c2hs, containers, limp, QuickCheck, tasty + , tasty-quickcheck, vector + }: mkDerivation { pname = "limp-cbc"; - version = "0.3.2.1"; - sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy"; + version = "0.3.2.2"; + sha256 = "0v637hrm980iqj3bh9p0ixirkhg3dwq7i36pff3n1fiav516qbww"; libraryHaskellDepends = [ base containers limp vector ]; libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ base limp ]; + testHaskellDepends = [ + base limp QuickCheck tasty tasty-quickcheck + ]; description = "bindings for integer linear programming solver Coin/CBC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -131478,8 +132201,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.3.0.0"; - sha256 = "1q67rsjnw8wsfvmz4a54nr7b9il59fdjbbra2wwnnyjldi29ykdq"; + version = "0.4.0.0"; + sha256 = "1b398yxyd0x2mlv5b70vgy1q3i8nk77fch7asyx8s42pnff4qqkq"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure text wl-pprint-text ]; @@ -136495,6 +137218,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mbug" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, http-client + , http-client-tls, optparse-applicative, process, scalpel-core + , tagsoup, text, th-printf, time, xdg-basedir + }: + mkDerivation { + pname = "mbug"; + version = "1.0"; + sha256 = "1bz8bwmapxssgs1j98xvad47185i81sqkydjf6r7329c4sn5gipv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory extra http-client http-client-tls + optparse-applicative process scalpel-core tagsoup text th-printf + time xdg-basedir + ]; + executableHaskellDepends = [ + base bytestring directory extra http-client http-client-tls + optparse-applicative process scalpel-core tagsoup text th-printf + time xdg-basedir + ]; + description = "download bugs mailboxes"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mcl" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, criterion , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl @@ -137473,6 +138221,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mergeless" = callPackage + ({ mkDerivation, aeson, base, containers, mtl, time, validity + , validity-containers, validity-time + }: + mkDerivation { + pname = "mergeless"; + version = "0.0.0.0"; + sha256 = "1wldriwz4247ikf73prlrgd2s5jfazq27p5b7yyfqmylx0h49vaz"; + libraryHaskellDepends = [ + aeson base containers mtl time validity validity-containers + validity-time + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "merkle-patricia-db" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring , binary, bytestring, containers, cryptonite, data-default @@ -138839,6 +139602,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs_1_0_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default, directory, filepath + , http-client, http-conduit, http-types, memory, protolude + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, temporary, text, time, transformers, unliftio + , unliftio-core, xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "1.0.1"; + sha256 = "0hxl56zx9xhyi14pmd4mns8r43pym1nhhfqrni3wxqrxh1w6qbsv"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit data-default + filepath http-client http-conduit http-types memory protolude + resourcet text time transformers unliftio unliftio-core xml-conduit + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit data-default + directory filepath http-client http-conduit http-types memory + protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck + tasty-smallcheck temporary text time transformers unliftio + unliftio-core xml-conduit + ]; + description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -140986,13 +141781,14 @@ self: { }: mkDerivation { pname = "monadiccp-gecode"; - version = "0.1.2"; - sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0"; + version = "0.1.3"; + sha256 = "0h3a82lrsvsdkdvf1m5hl9ayvikxp5p38wj5rpgn6qh8n5im2sn8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers monadiccp mtl ]; librarySystemDepends = [ gecodeint gecodekernel gecodesearch gecodeset gecodesupport ]; + testHaskellDepends = [ base ]; description = "Constraint Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -148205,20 +149001,16 @@ self: { }) {}; "notzero" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers + ({ mkDerivation, base, bifunctors, lens, mtl, semigroupoids + , semigroups, transformers }: mkDerivation { pname = "notzero"; - version = "0.0.11"; - sha256 = "0sqqffk1znyh7ghbx9ayr2khzxh5g07jjlarx78c051rb2sgdy77"; + version = "0.1"; + sha256 = "0l9z10njx18vp7xxcb0gys9dyq2g7i8i5mczymfknwdv9x3v2jk5"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; description = "A data type for representing numeric values, except zero"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -149506,18 +150298,19 @@ self: { "odpic-raw" = callPackage ({ mkDerivation, base, c2hs, conduit, hspec, monad-control , monad-logger, odpic, QuickCheck, resourcet, text, time + , unliftio-core }: mkDerivation { pname = "odpic-raw"; - version = "0.1.11"; - sha256 = "0via5p0sfma91ny5rw87sirmp4189663ww25dfwi6jlha4d82hlh"; + version = "0.2.0"; + sha256 = "0g83ag8ggcwmf82zghzdds990l5hvcfiv85rlj95phb0lpdskj5m"; libraryHaskellDepends = [ - base conduit monad-control resourcet text time + base conduit monad-control resourcet text time unliftio-core ]; librarySystemDepends = [ odpic ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base conduit hspec monad-logger QuickCheck resourcet + base conduit hspec monad-logger QuickCheck resourcet text ]; description = "Oracle Database Bindings"; license = stdenv.lib.licenses.bsd3; @@ -150037,14 +150830,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "online_0_2_3_0" = callPackage + "online_0_3_0_0" = callPackage ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude , tasty, tdigest, vector, vector-algorithms }: mkDerivation { pname = "online"; - version = "0.2.3.0"; - sha256 = "04yh51gdmb2nycsxjrfzkb07byxdmn1n9wrk7wv7nh3ki7jxi15d"; + version = "0.3.0.0"; + sha256 = "056a9dkrzfgj0wf9f9d9d25f6yc03jx9z0p0z5xm8n8brk6b3bds"; libraryHaskellDepends = [ base foldl numhask-prelude protolude tdigest vector vector-algorithms @@ -151581,8 +152374,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.2.0"; - sha256 = "1xx0mqq4c2war7ykr7md67dhhgh7h74b5j25arh1im7hgn1iy52x"; + version = "0.2.1"; + sha256 = "1zpkj3f0gdi5ri39s7g532j2pgk5mgs97y2g1gj42q9aa5lm5hw5"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -152467,8 +153260,8 @@ self: { pname = "pandoc"; version = "2.1.2"; sha256 = "0rgba2vfh2n7kh2g75hmxa6pbjk6p73a4zwj00pfsvhwyvpjc2yw"; - revision = "1"; - editedCabalFile = "1vk5g5dbk7q8w9pncqgkn4wbdj83p20ca6ipb5vca532x2294x5b"; + revision = "2"; + editedCabalFile = "0s7hhycdkjqw4sd6qj4n7lrf76aa4yaw4kaq35ivpjin7hrf011j"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -155764,14 +156557,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "perf_0_4_0_1" = callPackage + "perf_0_4_1_0" = callPackage ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc , text, time, transformers }: mkDerivation { pname = "perf"; - version = "0.4.0.1"; - sha256 = "1am2wzj43gi0naz5mwpvja9i005g05d6gpkqw0qvdy63mddz9b96"; + version = "0.4.1.0"; + sha256 = "1z0128fnqlraj8sj26fsfy9izfr1ld3k5c3sh0471fh36vf507c8"; libraryHaskellDepends = [ base containers deepseq foldl rdtsc text time transformers ]; @@ -155781,6 +156574,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perf-analysis" = callPackage + ({ mkDerivation, base, containers, deepseq, formatting + , optparse-generic, perf, protolude, scientific, tdigest, text + , vector + }: + mkDerivation { + pname = "perf-analysis"; + version = "0.0.1.1"; + sha256 = "1rjig10c7cy3lck2cvjs6drwrakb65mqhjgs6aakb07yjjl536pn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq formatting perf protolude scientific tdigest text + vector + ]; + executableHaskellDepends = [ + base containers deepseq formatting optparse-generic perf protolude + scientific tdigest text vector + ]; + description = "analysis example using perf"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "perfect-hash-generator" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-ordlist , directory, filepath, hashable, HUnit, optparse-applicative @@ -155904,11 +156720,14 @@ self: { }) {}; "permutation" = callPackage - ({ mkDerivation, base, ghc-prim, QuickCheck }: + ({ mkDerivation, base, Cabal, ghc-prim, process, QuickCheck }: mkDerivation { pname = "permutation"; version = "0.5.0.5"; sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai"; + revision = "1"; + editedCabalFile = "0lrargadwkwzzvajfiay8vkq1byh56kbr2h9ba9cfbpqwb4s90j9"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base ghc-prim QuickCheck ]; description = "A library for permutations and combinations"; license = stdenv.lib.licenses.bsd3; @@ -157023,8 +157842,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.23.0"; - sha256 = "139fjsyximny4ikgqrjxx9pg4spkz8s1fh6b3a9xgrsyya4r1sw7"; + version = "0.0.24.0"; + sha256 = "1kk8bfvai1196960cqq6zg5xhs15jzwllw57n247csiifijs0b0v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158181,6 +159000,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-fluid_0_6_0_1" = callPackage + ({ mkDerivation, async, base, constraints, hspec, lens + , lifted-async, mmorph, monad-control, mtl, pipes + , pipes-concurrency, pipes-misc, semigroups, stm, these + , transformers, transformers-base + }: + mkDerivation { + pname = "pipes-fluid"; + version = "0.6.0.1"; + sha256 = "01ig0czixnf5fypnfns2kzna676vd3mr2a52fb9f4cg7yy6qwp8h"; + libraryHaskellDepends = [ + base constraints lens lifted-async monad-control pipes semigroups + stm these transformers transformers-base + ]; + testHaskellDepends = [ + async base constraints hspec lens lifted-async mmorph monad-control + mtl pipes pipes-concurrency pipes-misc stm transformers + ]; + description = "Reactively combines Producers so that a value is yielded as soon as possible"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-group" = callPackage ({ mkDerivation, base, doctest, free, lens-family-core, pipes , pipes-parse, transformers @@ -161525,15 +162367,15 @@ self: { }) {}; "potoki-cereal" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, cereal, potoki + ({ mkDerivation, base, base-prelude, bytestring, cereal , potoki-core, text }: mkDerivation { pname = "potoki-cereal"; - version = "0.1.6"; - sha256 = "0mr3wv8mx88xzbkcrndq833wcq753dyp9z4610pxa34cfalnbvhf"; + version = "0.2"; + sha256 = "06fb615lki0pa341a8fv68vkyw13zax4zw6cappnffqccplvdhyg"; libraryHaskellDepends = [ - base base-prelude bytestring cereal potoki potoki-core text + base base-prelude bytestring cereal potoki-core text ]; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; @@ -161541,18 +162383,24 @@ self: { }) {}; "potoki-core" = callPackage - ({ mkDerivation, base, profunctors, QuickCheck - , quickcheck-instances, rerebase, stm, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, acquire, attoparsec, base, base-prelude + , bytestring, directory, foldl, hashable, profunctors, ptr + , QuickCheck, quickcheck-instances, random, rerebase, stm, tasty + , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan + , unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "1.5.2"; - sha256 = "1qkr3g7xfbkmvy2a4gcy0zxg22000mxdgw0dapq16pymj9wqf2si"; - libraryHaskellDepends = [ base profunctors stm ]; + version = "2"; + sha256 = "13zgqw4csypx5m97xfpbxxxic7rxms0xrz6wz5kk5x2pn6i9mgjl"; + libraryHaskellDepends = [ + acquire attoparsec base base-prelude bytestring directory foldl + hashable profunctors ptr stm text transformers unagi-chan + unordered-containers vector + ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + attoparsec QuickCheck quickcheck-instances random rerebase tasty + tasty-hunit tasty-quickcheck ]; description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; @@ -162857,6 +163705,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_6_4_0" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6.4.0"; + sha256 = "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "primitive-checked" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -162883,6 +163743,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "primitive-sort" = callPackage + ({ mkDerivation, base, containers, contiguous, doctest, gauge + , ghc-prim, HUnit, primitive, QuickCheck, random, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "primitive-sort"; + version = "0.1.0.0"; + sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3"; + libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; + testHaskellDepends = [ + base containers doctest HUnit primitive QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; + description = "Sort primitive arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -166160,8 +167039,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "2.0.0.0"; - sha256 = "01886bwkap8qk39iihlyrfa9g8cw6sicrynwk7r24nd5ib60csc3"; + version = "2.0.0.1"; + sha256 = "0n3f5zhyp0pvrb4ixvrvzs9af2x1mjprlnyjbhhldb3rc64jl7yd"; libraryHaskellDepends = [ base binary bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels microlens process split vector @@ -168813,8 +169692,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.9"; - sha256 = "0wz36zclpckkm8w7mmdzbklrr08ggyqsk7j4wfxbh4gxa0ry7yj5"; + version = "4.1.0"; + sha256 = "1skamrpkz8p9i19anyp0lqcncsa1zwzcikcxlm3gmrgqf2hq0m0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169822,8 +170701,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.2.3"; - sha256 = "1glnxvgf79qm2iz4xxdn6zygjff42cyakk1nah2wrzkkrr11axqk"; + version = "1.2.4"; + sha256 = "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -170500,6 +171379,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "refined_0_2_3_0" = callPackage + ({ mkDerivation, base, containers, exceptions, mtl, prettyprinter + , template-haskell, these, transformers + }: + mkDerivation { + pname = "refined"; + version = "0.2.3.0"; + sha256 = "1xc4qg2xibf2j0k6dwjj2sp5s58cj4dwcri6zrn42460wxnvyjk6"; + libraryHaskellDepends = [ + base containers exceptions mtl prettyprinter template-haskell these + transformers + ]; + description = "Refinement types with static and runtime checking"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflection" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -172840,22 +173736,26 @@ self: { }) {}; "require" = callPackage - ({ mkDerivation, base, bytestring, criterion, tasty, tasty-hspec - , text, universum + ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty + , tasty-hspec, text, universum }: mkDerivation { pname = "require"; - version = "0.0.1"; - sha256 = "04zi13y2xzgwrw4n0z2l7ii8rkl2d78n0cwq1xi2v5amr3kb8jjn"; + version = "0.2.1"; + sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring text universum ]; - executableHaskellDepends = [ base bytestring text universum ]; + libraryHaskellDepends = [ + base bytestring megaparsec text universum + ]; + executableHaskellDepends = [ + base bytestring megaparsec text universum + ]; testHaskellDepends = [ - base bytestring tasty tasty-hspec text universum + base bytestring megaparsec tasty tasty-hspec text universum ]; benchmarkHaskellDepends = [ - base bytestring criterion text universum + base bytestring criterion megaparsec text universum ]; description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; @@ -172865,8 +173765,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.2.1"; - sha256 = "02j119pabivn2x23mvvmzlkypxwi31p7s2fpakavhqfs6bmbnb2a"; + version = "1.2.2"; + sha256 = "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -178903,8 +179803,8 @@ self: { }: mkDerivation { pname = "self-extract"; - version = "0.2.0.0"; - sha256 = "1p1z4zy7s7j4sxx45lcspxvxf10v6vx80vgrw52acgbqnfairg7c"; + version = "0.2.1"; + sha256 = "0as9qxqh1pc695ds7kah5x241psnmfsp9hz2ilvvl73yanfg7j90"; libraryHaskellDepends = [ base binary bytestring Cabal extra file-embed path path-io process unix-compat @@ -180208,30 +181108,52 @@ self: { }) {}; "servant-checked-exceptions" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob - , hspec-wai, http-media, http-types, profunctors, servant - , servant-client, servant-client-core, servant-docs, servant-server - , tagged, tasty, tasty-hspec, tasty-hunit, text, wai + ({ mkDerivation, aeson, base, bytestring, deepseq, hspec-wai + , http-media, http-types, profunctors, servant + , servant-checked-exceptions-core, servant-client + , servant-client-core, servant-docs, servant-server, tagged, tasty + , tasty-hspec, tasty-hunit, text, wai, world-peace }: mkDerivation { pname = "servant-checked-exceptions"; - version = "1.1.0.0"; - sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk"; + version = "2.0.0.0"; + sha256 = "127nav7z2zkgfgzpjjprqb6s55mbdj9z2p05knjx3mangs2q5wm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring deepseq http-media http-types profunctors - servant servant-client servant-client-core servant-docs - servant-server tagged text wai + servant servant-checked-exceptions-core servant-client + servant-client-core servant-docs servant-server tagged text wai + world-peace ]; testHaskellDepends = [ - base bytestring doctest Glob hspec-wai http-types servant - servant-server tasty tasty-hspec tasty-hunit wai + base bytestring hspec-wai http-types servant servant-server tasty + tasty-hspec tasty-hunit wai ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-checked-exceptions-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob + , http-media, http-types, profunctors, servant, servant-docs + , tagged, text, world-peace + }: + mkDerivation { + pname = "servant-checked-exceptions-core"; + version = "2.0.0.0"; + sha256 = "0j5j7ai1b7nnsvzal27jy6hamwx5i2pyc1f6mmmb06r40cs53lxa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring deepseq http-media http-types profunctors + servant servant-docs tagged text world-peace + ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Checked exceptions for Servant APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , containers, deepseq, exceptions, generics-sop, hspec @@ -181689,8 +182611,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.5.0"; - sha256 = "0di9l77x6skbf26vic4sg83187lgkc98yzakip1ix5d9a45niz6m"; + version = "0.5.2"; + sha256 = "1nsxc9kif57fvr6j1pp116llbmyb1ngvzgndcfjwvdbscl23jfwg"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -182242,28 +183164,29 @@ self: { "sexp-grammar" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, happy, mtl, prettyprinter, profunctors, QuickCheck - , scientific, semigroups, split, tagged, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, transformers + , criterion, deepseq, happy, invertible-grammar, prettyprinter + , QuickCheck, recursion-schemes, scientific, semigroups, split + , tasty, tasty-hunit, tasty-quickcheck, text, utf8-string }: mkDerivation { pname = "sexp-grammar"; - version = "1.3.0"; - sha256 = "0h9b9rmymfy0qwr51yllapmp7g0j3f70pmhwyzag782giff8q0x3"; + version = "2.0.0"; + sha256 = "1wf9mrmz89kcvrkyif5mp0wwqxgg363f3jc7y9sf370qc4frm68p"; libraryHaskellDepends = [ - array base bytestring containers mtl prettyprinter profunctors - scientific semigroups split tagged template-haskell text - transformers + array base bytestring containers deepseq invertible-grammar + prettyprinter recursion-schemes scientific semigroups split text + utf8-string ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - base QuickCheck scientific semigroups tasty tasty-hunit - tasty-quickcheck text + base containers invertible-grammar prettyprinter QuickCheck + scientific semigroups tasty tasty-hunit tasty-quickcheck text + utf8-string ]; benchmarkHaskellDepends = [ - base bytestring criterion scientific semigroups text + base bytestring criterion deepseq text ]; - description = "Invertible parsers for S-expressions"; + description = "Invertible grammar combinators for S-expressions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -182600,8 +183523,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.3"; - sha256 = "0v5n7l3xx1a0y4vvrn0zi61pb3wd41pqh1g3vnq1dr12dhrrx1ac"; + version = "2.11.0.4"; + sha256 = "0c7jbbq69y0v6244c6fx6kw9sp8sl5kkmnrfcryfwdgahj3psnp4"; libraryHaskellDepends = [ base Cabal cdeps composition-prelude cpphs directory shake template-haskell @@ -183288,30 +184211,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shelly_1_8_0" = callPackage + "shelly_1_8_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process , system-fileio, system-filepath, text, time, transformers - , transformers-base, unix-compat + , transformers-base, unix, unix-compat }: mkDerivation { pname = "shelly"; - version = "1.8.0"; - sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; + version = "1.8.1"; + sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers directory enclosed-exceptions exceptions lifted-async lifted-base monad-control mtl process system-fileio system-filepath text time transformers - transformers-base unix-compat + transformers-base unix unix-compat ]; testHaskellDepends = [ async base bytestring containers directory enclosed-exceptions exceptions filepath hspec hspec-contrib HUnit lifted-async lifted-base monad-control mtl process system-fileio system-filepath - text time transformers transformers-base unix-compat + text time transformers transformers-base unix unix-compat ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -184931,8 +185854,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "simtreelo"; - version = "0.1.1.2"; - sha256 = "1wn3hycwn0i25jad096g6hzkxrm64j2hpjdpp8lr69mdrcmn2gmx"; + version = "0.1.1.3"; + sha256 = "148j6z8rxqaiwfjgxz780fy8w8xv8a8gwida61lfir677jlkwgh9"; libraryHaskellDepends = [ base containers ]; description = "Loader for data organized in a tree"; license = stdenv.lib.licenses.gpl3; @@ -185225,8 +186148,8 @@ self: { ({ mkDerivation, base, bytestring, containers, lens, mtl }: mkDerivation { pname = "sixty-five-oh-two"; - version = "1.1.0.0"; - sha256 = "1jw86xxim016gqws34diabdlrlilypg22s6670n7x887sjc1bkz6"; + version = "1.2.0.0"; + sha256 = "0xxx8k6zx8h2a3ddgic5k52nhzlxz8r7kkfmsyhaycwhkrgkfvsq"; libraryHaskellDepends = [ base bytestring containers lens mtl ]; testHaskellDepends = [ base bytestring containers lens mtl ]; description = "An eDSL for writing 65(C)02 bytecode"; @@ -188864,8 +189787,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.2.0"; - sha256 = "061bjgrvvvv2n6bhn0lz6sd5c7mc63nb2b83rbpgdx3am68mk9gf"; + version = "0.0.2.1"; + sha256 = "1j20536pjp4m26l8zvsaf8wv0vvj0fkwid1nkljl6zkggaqq5b8f"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -189201,6 +190124,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "speechmatics" = callPackage + ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, hspec + , http-client, http-client-openssl, http-types, json-autotype, lens + , mime-types, neat-interpolation, options, SHA, text, wreq + }: + mkDerivation { + pname = "speechmatics"; + version = "0.4.0.0"; + sha256 = "0lnv4rq0iaj4j9mf49ws43p9ajini1q1vzj4yyvlnpwikkn6yk67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring HsOpenSSL http-client http-client-openssl + http-types json-autotype lens mime-types text wreq + ]; + executableHaskellDepends = [ + base bytestring mime-types options SHA text + ]; + testHaskellDepends = [ + base bytestring hspec neat-interpolation text + ]; + description = "Speechmatics api client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "speedy-slice" = callPackage ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types , mwc-probability, pipes, primitive, transformers @@ -190598,8 +191546,8 @@ self: { pname = "stack"; version = "1.7.1"; sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; - revision = "3"; - editedCabalFile = "0ni953da0qiscnvbx70pd89myy2qq3chgkghmw6wg9xhzcz7nwgp"; + revision = "4"; + editedCabalFile = "06imaj3adll2lwfivkv3axzfkaj6nfp0vbq6vsmpknw0r8s32xad"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -192414,15 +193362,18 @@ self: { }) {}; "stocks" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, semigroups + ({ mkDerivation, aeson, base, bytestring, containers, http-conduit + , HUnit, semigroups, unordered-containers }: mkDerivation { pname = "stocks"; - version = "0.1.0.0"; - sha256 = "10ws7mg0236iqkjclajwph2lb5719adkay5imaxrsj13d10f8ssq"; + version = "0.2.0.0"; + sha256 = "1rbspmxw81739hjzj5bd365zm9jqmsq5lv70d3wc8vvvf92zimi9"; libraryHaskellDepends = [ - aeson base bytestring http-conduit semigroups + aeson base bytestring containers http-conduit semigroups + unordered-containers ]; + testHaskellDepends = [ base bytestring HUnit ]; description = "Library for the IEX Trading API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -192677,6 +193628,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_0" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.0"; + sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant criterion cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text , transformers @@ -192692,6 +193695,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store-core_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, primitive, text + , transformers + }: + mkDerivation { + pname = "store-core"; + version = "0.4.3"; + sha256 = "0fx4ylhqm79pi6k8qzby6nb0d7nlq5za8n3fir1v97wl34vmr3gf"; + libraryHaskellDepends = [ + base bytestring ghc-prim primitive text transformers + ]; + description = "Fast and lightweight binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "store-streaming" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, free, hspec + , hspec-smallcheck, network, resourcet, smallcheck, store + , store-core, streaming-commons, text, transformers, void + }: + mkDerivation { + pname = "store-streaming"; + version = "0.1.0.0"; + sha256 = "04vsglnxqgznnacgmb34z3dsb7pz1kmc2fis1ij5p7k740c9gn2g"; + libraryHaskellDepends = [ + async base bytestring conduit free resourcet store store-core + streaming-commons text transformers + ]; + testHaskellDepends = [ + async base bytestring conduit free hspec hspec-smallcheck network + resourcet smallcheck store store-core streaming-commons text + transformers void + ]; + description = "Streaming interfaces for `store`"; + license = stdenv.lib.licenses.mit; + }) {}; + "str" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Crypto , hashable, MissingH, text, utf8-string @@ -192732,15 +193773,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_23_0" = callPackage + "stratosphere_0_24_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.23.0"; - sha256 = "0np2rxcs0fld06ihldgmi9i61344dx64w1dz0vlfrnkrcjpkqhif"; + version = "0.24.0"; + sha256 = "02hpx1j1s4rjgf39qg9vxmdqvvb2il0w291gv8819fzmrrifhym5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194727,6 +195768,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "summoner" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory + , filepath, generic-deriving, hedgehog, neat-interpolation + , optparse-applicative, process, tasty, tasty-discover + , tasty-hedgehog, text, time, tomland, universum + }: + mkDerivation { + pname = "summoner"; + version = "1.0.2"; + sha256 = "164mcpcjmbqrpdxaw693394s15f13i8mvxaq7ib7rflavkjdm8qh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring directory filepath + generic-deriving neat-interpolation optparse-applicative process + text time tomland universum + ]; + executableHaskellDepends = [ base universum ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog universum + ]; + testToolDepends = [ tasty-discover ]; + description = "Tool for creating completely configured production Haskell projects"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -197001,8 +198068,8 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers - , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions + ({ mkDerivation, base, cairo, ConfigFile, containers, dbus + , dbus-hslogger, directory, dyre, either, enclosed-exceptions , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib , gi-gtk, gi-gtk-hs, glib, gtk-sni-tray, gtk-strut, gtk-traymanager , gtk3, haskell-gi, haskell-gi-base, hslogger, HStringTemplate @@ -197015,16 +198082,16 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "2.1.0"; - sha256 = "1a32wpxjyimn08pmbwwx7crn97hg9wmlva5f0blkw4cwv090jhh8"; + version = "2.1.1"; + sha256 = "13bp0ydwb26k8y4f3cn47qy24lwxfx9v7ysm1q0r8iksjg9a6lhk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger - directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk - gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs glib gtk-sni-tray - gtk-strut gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger + base cairo ConfigFile containers dbus dbus-hslogger directory dyre + either enclosed-exceptions filepath gi-cairo gi-gdk gi-gdkpixbuf + gi-gdkx11 gi-glib gi-gtk gi-gtk-hs glib gtk-sni-tray gtk-strut + gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger HStringTemplate HTTP multimap network network-uri old-locale parsec process rate-limit regex-compat safe split status-notifier-item stm template-haskell text time time-locale-compat time-units @@ -197980,12 +199047,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_2_0_2" = callPackage + "tasty-dejafu_1_2_0_4" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.2"; - sha256 = "145w018mv8928g9bbp5pjwzciyfspxxqdg5grzq0mlpydkpmmgr5"; + version = "1.2.0.4"; + sha256 = "151cr15l4v1p1zlfps4q3wv26v2mhcnplnnx03lmcq9di21y95yn"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -198865,6 +199932,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "telegram-bot-simple" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron + , hashable, http-api-data, http-client, http-client-tls + , monad-control, mtl, pretty-show, profunctors, servant + , servant-client, split, stm, template-haskell, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "telegram-bot-simple"; + version = "0.2.0"; + sha256 = "1aafj27zj69hvzxv58cz7h8pjbc9c74hmg92swg2sy8ai1rcb34a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cron hashable http-api-data + http-client http-client-tls monad-control mtl pretty-show + profunctors servant servant-client split stm template-haskell text + time transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cron hashable http-api-data + http-client http-client-tls monad-control mtl pretty-show + profunctors servant servant-client split stm template-haskell text + time transformers unordered-containers + ]; + description = "Easy to use library for building Telegram bots"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "teleport" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , configurator, optparse-applicative, system-filepath, text, turtle @@ -203730,8 +204826,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.4.6"; - sha256 = "012mvfwn9dy50xpmi4hgf5rq7k4660fjbwdhs3f02x0wndh77n49"; + version = "1.8.0"; + sha256 = "1i5hdyxrrflxbw59i55p7bxfn75m2j6dmn7h43f9qwcgn6fv3l3y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210421,6 +211517,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unpacked-these" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck + , quickcheck-classes, these, unpacked-maybe + }: + mkDerivation { + pname = "unpacked-these"; + version = "0.1.0.0"; + sha256 = "18m0ynw9dnyfkk4nvkfp0qjhzwis5696si3cvkh5chpqm6m725sv"; + libraryHaskellDepends = [ + base deepseq ghc-prim these unpacked-maybe + ]; + testHaskellDepends = [ base QuickCheck quickcheck-classes ]; + description = "An unpacked these data type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "unpacked-validation" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck + , quickcheck-classes, unpacked-either, validation + }: + mkDerivation { + pname = "unpacked-validation"; + version = "0.1.0.0"; + sha256 = "058lp5b4cpyksmpnzj5v1vckbaa22mclprfqq9bl619vpr3y0gg2"; + libraryHaskellDepends = [ + base deepseq ghc-prim unpacked-either validation + ]; + testHaskellDepends = [ base QuickCheck quickcheck-classes ]; + description = "An unpacked validation data type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unroll-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -212504,6 +213632,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vault_0_3_1_1" = callPackage + ({ mkDerivation, base, containers, hashable, semigroups + , unordered-containers + }: + mkDerivation { + pname = "vault"; + version = "0.3.1.1"; + sha256 = "0a1fir7gvbj2w894daac5c4c3gy36r6c74yci78lb2nvk431b95j"; + libraryHaskellDepends = [ + base containers hashable semigroups unordered-containers + ]; + description = "a persistent store for values of arbitrary types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vault-tool" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, text, unordered-containers @@ -217010,6 +218154,84 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "webex-teams-api" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp + }: + mkDerivation { + pname = "webex-teams-api"; + version = "0.2.0.0"; + sha256 = "02x4g10r0rl1g4fbqkj8zxcbz64g8dck4d77f0gswkadsn5y6mkp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring data-default hspec + http-conduit http-types network-uri text wai warp + ]; + description = "A Haskell bindings for Webex Teams API"; + license = stdenv.lib.licenses.mit; + }) {}; + + "webex-teams-conduit" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , data-default, hspec, http-client, http-conduit, http-types + , network-uri, optparse-applicative, text, utf8-string, wai, warp + , webex-teams-api + }: + mkDerivation { + pname = "webex-teams-conduit"; + version = "0.2.0.0"; + sha256 = "0p9ffj3qm84c7m4w5bfpn53vcs96p7gdlyk87mjmc9h9i6v7sz0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base conduit webex-teams-api ]; + executableHaskellDepends = [ + base bytestring conduit data-default http-client + optparse-applicative text utf8-string webex-teams-api + ]; + testHaskellDepends = [ + aeson async base bytestring conduit data-default hspec http-conduit + http-types network-uri text wai warp webex-teams-api + ]; + description = "Conduit wrapper of Webex Teams List API"; + license = stdenv.lib.licenses.mit; + }) {}; + + "webex-teams-pipes" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, data-default + , hspec, http-client, http-conduit, http-types, network-uri + , optparse-applicative, pipes, text, utf8-string, wai, warp + , webex-teams-api + }: + mkDerivation { + pname = "webex-teams-pipes"; + version = "0.2.0.0"; + sha256 = "001ilf2yj6q8rqcagjlh28rad191jyjjr1cpk6cf84v66isdbykp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pipes webex-teams-api ]; + executableHaskellDepends = [ + base bytestring data-default http-client optparse-applicative pipes + text utf8-string webex-teams-api + ]; + testHaskellDepends = [ + aeson async base bytestring data-default hspec http-conduit + http-types network-uri pipes text wai warp webex-teams-api + ]; + description = "Pipes wrapper of Webex Teams List API"; + license = stdenv.lib.licenses.mit; + }) {}; + "webfinger-client" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , hashable, http-client, http-client-tls, http-types @@ -217242,6 +218464,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_5_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, bytestring-builder, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.5.0"; + sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy network + random SHA streaming-commons text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy HUnit + network QuickCheck random SHA streaming-commons test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers criterion entropy + network random SHA text + ]; + doCheck = false; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, mtl, QuickCheck @@ -217909,6 +219166,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "winery" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, mtl + , prettyprinter, prettyprinter-ansi-terminal, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "winery"; + version = "0"; + sha256 = "0bhgiw2zljr50cyhfc8rzkd217g8mvl56f82ys5z0kvr5gp8mjdw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers hashable mtl prettyprinter + prettyprinter-ansi-terminal text transformers unordered-containers + vector + ]; + executableHaskellDepends = [ + base bytestring containers hashable mtl prettyprinter + prettyprinter-ansi-terminal text transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers hashable mtl prettyprinter + prettyprinter-ansi-terminal text transformers unordered-containers + vector + ]; + description = "Sustainable serialisation library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "winio" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, kernel32 , network, winerror, ws2_32 @@ -219368,7 +220655,7 @@ self: { "wxc" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , libX11, mesa, process, split, wxdirect, wxGTK + , libGL, libX11, process, split, wxdirect, wxGTK }: mkDerivation { pname = "wxc"; @@ -219380,7 +220667,7 @@ self: { base bytestring Cabal directory filepath process split ]; libraryHaskellDepends = [ base split wxdirect ]; - librarySystemDepends = [ libX11 mesa ]; + librarySystemDepends = [ libGL libX11 ]; libraryPkgconfigDepends = [ wxGTK ]; doHaddock = false; postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $out/lib/libwxc.so"; @@ -219388,7 +220675,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -222041,6 +223328,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml-pretty-extras" = callPackage + ({ mkDerivation, base, bytestring, errors, hspec, mtl, text, yaml + }: + mkDerivation { + pname = "yaml-pretty-extras"; + version = "0.0.1.1"; + sha256 = "1xb4f76w1sqhv7bkjzzyn13x13ldzpbmnn9kqkq0lzs8zlcyyyjn"; + libraryHaskellDepends = [ base bytestring errors mtl text yaml ]; + testHaskellDepends = [ + base bytestring errors hspec mtl text yaml + ]; + description = "Extra functionality for pretty printing Yaml documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yaml-rpc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-client , http-types, lens, template-haskell, text, th-lift, transformers @@ -223164,6 +224466,8 @@ self: { pname = "yesod-core"; version = "1.4.37.3"; sha256 = "1jw1302p5s9jy7xghxzg9j63pn6b1hp957n1808qyk1iz7yrfsg0"; + revision = "2"; + editedCabalFile = "0hgrp8i33zssjlvkbvlnrr5ppblvn1vzhxlax2m5qyjjg60cqjsp"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -223812,6 +225116,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-paginator_1_1_0_0" = callPackage + ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces + , persistent, safe, text, transformers, uri-encode, yesod-core + , yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-paginator"; + version = "1.1.0.0"; + sha256 = "03h9zpplsglblcdf0cm36i3kmmfbhk6iqwq2vsh8nw5ygizcqh0n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup path-pieces persistent safe text transformers + uri-encode yesod-core yesod-persistent + ]; + testHaskellDepends = [ base doctest hspec yesod-core yesod-test ]; + description = "A pagination approach for yesod"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-paypal-rest" = callPackage ({ mkDerivation, base, paypal-rest-client, time, yesod-core }: mkDerivation { @@ -225567,16 +226892,16 @@ self: { }) {}; "zephyr" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base-compat, boxes - , bytestring, containers, directory, filepath, formatting, Glob - , hspec, hspec-core, HUnit, language-javascript, mtl - , optparse-applicative, process, purescript, safe, text + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, boxes, bytestring, containers, directory, filepath + , formatting, Glob, hspec, hspec-core, HUnit, language-javascript + , mtl, optparse-applicative, process, purescript, safe, text , transformers, transformers-base, transformers-compat, utf8-string }: mkDerivation { pname = "zephyr"; - version = "0.1.1.0"; - sha256 = "0wh6yarc890j442s5kmqpsl03y0f8n4kq43sx1k8y63avhq1qi2m"; + version = "0.1.4"; + sha256 = "0zsqn8rbrzdh1l2m44nqhcdx3y3lbxdvik4scs5lb0sz5a0rdx5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225586,10 +226911,10 @@ self: { transformers-base transformers-compat utf8-string ]; executableHaskellDepends = [ - aeson ansi-terminal base base-compat bytestring containers - directory filepath formatting Glob language-javascript mtl - optparse-applicative purescript text transformers transformers-base - transformers-compat utf8-string + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + containers directory filepath formatting Glob language-javascript + mtl optparse-applicative purescript text transformers + transformers-base transformers-compat utf8-string ]; testHaskellDepends = [ aeson ansi-terminal base base-compat bytestring containers @@ -226039,6 +227364,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip;}; + "zip-archive_0_3_2_5" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, old-time, pretty + , process, temporary, text, time, unix, unzip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.2.5"; + sha256 = "14xkaj456zpxxbwd1h5prcxiiid42snli4mqm1052jp32c7xhf89"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl old-time pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit old-time process temporary + time unix + ]; + testToolDepends = [ unzip ]; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl From b2d07e093fd14adca8d1b6b7a4bb522cf7416ce0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Jun 2018 09:56:41 +0200 Subject: [PATCH 19/63] git-annex: update sha256 hash for new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 387983003af3..b92ba205b843 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -82,7 +82,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1w0gzqk70ymlpvh9zqkg1cd3ipaw4n85k4zsf49xl6kjp4vbcmwj"; + sha256 = "0cz044zjp067xjx0dw1yg3n7vnrkn1j3rvnk9i3jf1aqfvm1szwy"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); From dd06ec2cf84c0c4b938f315ecd5c1c0e874ffd16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Jun 2018 18:19:30 +0200 Subject: [PATCH 20/63] all-cabal-hashes: update snapshot to Hackage at 2018-05-29T07:28:04Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e2f14a059c24..4612556f73db 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/810aa8e3848857c1158ded74a52159220119d188.tar.gz"; - sha256 = "1s4x3ipn2san4rvfagmczdn70rhygpwwdmz0pqvy7q4rmgxy9x1i"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a869307fd58b59579f78e5631b9bc8ae6b9bb92.tar.gz"; + sha256 = "1i6gg49gibbqgc0iq87qlf6cqmi67pk8y2zbiz3gynqzrcmqbhfd"; } From 47a08c1918effcc44b8aa8c999a4a6d694e3b7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Jun 2018 09:37:30 +0200 Subject: [PATCH 21/63] home-assistant: add voluptuous-serialize to propagatedBuildInputs --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index abe57c2d57f9..e2acee87d1ab 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -228,7 +228,7 @@ "comfoconnect" = ps: with ps; [ ]; "config" = ps: with ps; [ aiohttp-cors ]; "config.automation" = ps: with ps; [ ]; - "config.config_entries" = ps: with ps; [ ]; + "config.config_entries" = ps: with ps; [ voluptuous-serialize ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; "config.entity_registry" = ps: with ps; [ ]; @@ -402,7 +402,7 @@ "http.real_ip" = ps: with ps; [ ]; "http.static" = ps: with ps; [ ]; "http.view" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue voluptuous-serialize ]; + "hue" = ps: with ps; [ aiohue ]; "hue.bridge" = ps: with ps; [ ]; "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; @@ -459,7 +459,7 @@ "light.hive" = ps: with ps; [ ]; "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; - "light.hue" = ps: with ps; [ aiohue voluptuous-serialize ]; + "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; "light.ihc" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 60b005ed54cc..fbc233398735 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -95,8 +95,8 @@ in with py.pkgs; buildPythonApplication rec { propagatedBuildInputs = [ # From setup.py requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs - # From http, frontend and recorder components - sqlalchemy aiohttp-cors hass-frontend + # From http, frontend, recorder and config.config_entries components + sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ From 5413bce5d3a839ef1b959118b656e9f597d40c3b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 5 Jun 2018 07:27:52 -0400 Subject: [PATCH 22/63] dbeaver: 5.0.6 -> 5.1.0 (#41468) --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index b7acd297d3ee..84150a4c32c6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.6"; + version = "5.1.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "12crrazlfzvr1c6y33z7v4z7ip9pjbzki8cw15v5d2irkpa710ky"; + sha256 = "041wqlipkwk4xp3qa4rrwyw6rgsn1ppv25qb4h2mkhrsjcjagqhj"; }; installPhase = '' From f44c16401e71aac01028a75f46bd52480f9b49b0 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 5 Jun 2018 13:43:28 +0200 Subject: [PATCH 23/63] s-tar: fix eval error Fixes #41479 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 198b00e7c5ac..8906893112d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2157,7 +2157,7 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; - s-tar = callPackages ../tools/archivers/s-tar {}; + s-tar = callPackage ../tools/archivers/s-tar {}; tealdeer = callPackage ../tools/misc/tealdeer { }; From 23bfa472ad38e9b423ad6078e498b5f24834ebcc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Jun 2018 16:25:47 +0200 Subject: [PATCH 24/63] jekyll: 3.8.2 -> 3.8.3 --- .../misc/jekyll/basic/Gemfile.lock | 8 +++---- .../applications/misc/jekyll/basic/gemset.nix | 16 ++++++------- .../misc/jekyll/full/Gemfile.lock | 12 +++++----- pkgs/applications/misc/jekyll/full/gemset.nix | 24 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 3cead5d24ad2..15beb8a88fb1 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -14,7 +14,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.9.23) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) html-pipeline (2.8.0) @@ -23,7 +23,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.2) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -43,7 +43,7 @@ GEM jekyll (~> 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) @@ -53,7 +53,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) - kramdown (1.16.2) + kramdown (1.17.0) liquid (4.0.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index e96438eefe3a..a75f74119ca7 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -53,10 +53,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; forwardable-extended = { 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 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8"; + sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk"; type = "gem"; }; - version = "3.8.2"; + version = "3.8.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -140,10 +140,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big"; + sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -175,10 +175,10 @@ kramdown = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; type = "gem"; }; - version = "1.16.2"; + version = "1.17.0"; }; liquid = { source = { diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 323a0c2f3601..0689bad59806 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -22,10 +22,10 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.9.23) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) html-pipeline (2.8.0) @@ -34,7 +34,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.2) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -52,7 +52,7 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-feed (0.9.3) + jekyll-feed (0.10.0) jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) @@ -64,7 +64,7 @@ GEM jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) @@ -74,7 +74,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) - kramdown (1.16.2) + kramdown (1.17.0) liquid (4.0.0) liquid-c (3.0.0) liquid (>= 3.0.0) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 7fc93589236f..e5eb6d62a706 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -96,10 +96,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx"; + sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; type = "gem"; }; - version = "0.15.1"; + version = "0.15.2"; }; fast-stemmer = { source = { @@ -112,10 +112,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; forwardable-extended = { 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 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8"; + sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk"; type = "gem"; }; - version = "3.8.2"; + version = "3.8.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -190,10 +190,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kr3kyaq4z3jixn6ay8h16bxxlv6slvvp7nqnl05jdymhkl0bmm9"; + sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j"; type = "gem"; }; - version = "0.9.3"; + version = "0.10.0"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -243,10 +243,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big"; + sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -278,10 +278,10 @@ kramdown = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; type = "gem"; }; - version = "1.16.2"; + version = "1.17.0"; }; liquid = { source = { From dcfaef2b8ee59a7c329ae1d0a8cf8fe2a9556ccc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Jun 2018 17:16:53 +0200 Subject: [PATCH 25/63] tdesktopPackages.preview: 1.3.0 -> 1.3.1 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 50a0d6db2273..59e7c0c2dd9a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,7 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.3.0"; - sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i"; + version = "1.3.1"; + sha256Hash = "084zrdx3w1yq53r53zjbqpz7s8fc3ga26ffwyfxj07ysmyn7ck25"; }); } From 137a372d7080d19b0cd86ff3d7dd0dc9bc05981e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Jun 2018 17:20:25 +0200 Subject: [PATCH 26/63] tdesktop: 1.2.17 -> 1.3.0 It still displays "Version 1.3 alpha" but other than that it should be fine. --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 59e7c0c2dd9a..b6f91f02f833 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.2.17"; - sha256Hash = "1lswjn3rnrbps1pd2xhnhggcn1z0i7y71dpr0v9wb1yc8qhh4pi0"; + version = "1.3.0"; + sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "310557"; archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; From db68f314dbf7683f5cdd9f95aaae45faf31a3b72 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 5 Jun 2018 17:30:12 +0200 Subject: [PATCH 27/63] udiskie: 1.7.4 -> 1.7.5 (#41480) `udiskie` breaks for me with the following error when using 1.7.4: ``` Traceback (most recent call last): File "/nix/store/cqa72mqgm5gi0xpqp5r8csdizv3p3ajr-udiskie-1.7.4/lib/python3.6/site-packages/udiskie/cli.py", line 307, in _start_async_tasks results = yield self._init() File "/nix/store/cqa72mqgm5gi0xpqp5r8csdizv3p3ajr-udiskie-1.7.4/lib/python3.6/site-packages/udiskie/cli.py", line 495, in _init tasks.append(Async()) NameError: name 'Async' is not defined ``` The error has been confirmed by the Debian issue tracker, so it's obviously not related to NixOS. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=899419 for further reference. --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index f3dc92605f37..1db0e4be1966 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "0r3m8y6ppkl8p1lhr89sfk9v2la1zn0rbmr6hy860j7b22yvnkrn"; + sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4"; }; buildInputs = [ From 527f11bde380ebe3a31857bf3157b31ba6b3a14a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 5 Jun 2018 17:33:48 +0200 Subject: [PATCH 28/63] lombok: 1.6.20 -> 1.6.22 (#41455) --- pkgs/development/libraries/java/lombok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index df9b3f96c871..5ec4634d6323 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.16.20"; + name = "lombok-1.16.22"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "0v8fq4qlpjh4b87xx35m32y2xpnj4d05xflrgghia6mar8c8n5y5"; + sha256 = "1hr2jjlqdnxrw7ablqkf7ljc6n2q6a04ww14di06zs6i3l82zzpa"; }; buildCommand = '' From bfea60ff64d0e27f054aa04704576ff24d46c622 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Tue, 5 Jun 2018 17:42:20 +0200 Subject: [PATCH 29/63] ponyc: 0.22.3 -> 0.22.5 (#41484) --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index a074c3d3a369..b7037c9b9a86 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.22.3"; + version = "0.22.5"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0av664n3k73psn00bd36pibkyc5b530aqqiqpg4mw2ks060dm40v"; + sha256 = "1kxn4chc35h72hrblfrmmwgzb9s1sjsjazwz1dksj3hy45288lj1"; }; buildInputs = [ llvm makeWrapper which ]; From 967467c0e522a4ce5690acbb2abeebddecf941ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 Jun 2018 12:24:32 -0400 Subject: [PATCH 30/63] linux: 4.9.105 -> 4.9.106 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d69717b15fe7..e4a02b10e992 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.105"; + version = "4.9.106"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i3dv7lvh7b08943iw45j0x99878wia83fribbgxn7xcwcld51fh"; + sha256 = "0g5y3ckwb1zn8gzsk1sc6vnmsrvsx5g2a1p0p9hrmsl8jnr9nh1d"; }; } // (args.argsOverride or {})) From 661721f998efcf1ac63041f261a81b225d67ac65 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 Jun 2018 12:24:48 -0400 Subject: [PATCH 31/63] linux: 4.14.47 -> 4.14.48 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d7bcd411764b..786709d53283 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.47"; + version = "4.14.48"; # 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 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7"; + sha256 = "1f92pz92mf0x9jfv3qf4w40i78l053f2qh2n8p2sbrqzc67n1840"; }; } // (args.argsOverride or {})) From 6842319f8148cfb9d1644ebc0465169d75d91317 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 Jun 2018 12:25:02 -0400 Subject: [PATCH 32/63] linux: 4.16.13 -> 4.16.14 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 1b0c42b81114..0a06c4dd434e 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.13"; + version = "4.16.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qzj5mbkxkrpmnwws8vdz292gp863kybrgr9bvgs7v28plx7n2kg"; + sha256 = "1h6zjnwpdyqk9fp72c35565lhw00kpjl55faakwx7xsxfpyvc25p"; }; } // (args.argsOverride or {})) From f98272d6e293a9deae83a9274f1061f0121e84c9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 5 Jun 2018 18:43:42 +0200 Subject: [PATCH 33/63] Revert "lib: bitAnd, bitOr, bitXor" --- lib/default.nix | 8 ++++---- lib/tests/misc.nix | 15 --------------- lib/trivial.nix | 43 ------------------------------------------- 3 files changed, 4 insertions(+), 62 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index d608d7094474..4ca2e2ea6e37 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -56,10 +56,10 @@ let hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; - inherit (trivial) id const concat or and bitAnd bitOr bitXor - boolToString mergeAttrs flip mapNullable inNixShell min max - importJSON warn info nixpkgsVersion version mod compare - splitByAndCompare functionArgs setFunctionArgs isFunction; + inherit (trivial) id const concat or and boolToString mergeAttrs + flip mapNullable inNixShell min max importJSON warn info + nixpkgsVersion version mod compare splitByAndCompare + functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index eab20d0f14dc..c683df7d7ca3 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -45,21 +45,6 @@ runTests { expected = true; }; - testBitAnd = { - expr = (bitAnd 3 10); - expected = 2; - }; - - testBitOr = { - expr = (bitOr 3 10); - expected = 11; - }; - - testBitXor = { - expr = (bitXor 3 10); - expected = 9; - }; - # STRINGS testConcatMapStrings = { diff --git a/lib/trivial.nix b/lib/trivial.nix index 86e3c939dd69..251cb796db0e 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,38 +1,4 @@ { lib }: -let - zipIntBits = f: x: y: - let - # (intToBits 6) -> [ 0 1 1 ] - intToBits = x: - if x==0 then - [] - else - let - headbit = if (x / 2) * 2 != x then 1 else 0; # x & 1 - tailbits = if x < 0 then 9223372036854775807 + ((x+1) / 2) else x / 2; # x >>> 1 - in - [headbit] ++ (intToBits tailbits); - - # (bitsToInt [ 0 1 1 ]) -> 6 - bitsToInt = l: - if l==[] then - 0 - else - (builtins.head l) + (2 * (bitsToInt (builtins.tail l))); - - zipListsWith' = fst: snd: - if fst==[] && snd==[] then - [] - else if fst==[] then - [(f 0 (builtins.head snd))] ++ (zipListsWith' [] (builtins.tail snd)) - else if snd==[] then - [(f (builtins.head fst) 0 )] ++ (zipListsWith' (builtins.tail fst) [] ) - else - [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd)); - in - assert (builtins.isInt x) && (builtins.isInt y); - bitsToInt (zipListsWith' (intToBits x) (intToBits y)); -in rec { /* The identity function @@ -65,15 +31,6 @@ rec { /* boolean “and” */ and = x: y: x && y; - /* bitwise “and” */ - bitAnd = builtins.bitAnd or zipIntBits (a: b: if a==1 && b==1 then 1 else 0); - - /* bitwise “or” */ - bitOr = builtins.bitOr or zipIntBits (a: b: if a==1 || b==1 then 1 else 0); - - /* bitwise “xor” */ - bitXor = builtins.bitXor or zipIntBits (a: b: if a!=b then 1 else 0); - /* Convert a boolean to a string. Note that toString on a bool returns "1" and "". */ From 52de38f5f40a97dc46bbb9a442903f26e087bd30 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 5 Jun 2018 10:37:12 -0400 Subject: [PATCH 34/63] grub-config.xml: handle a null font --- nixos/modules/system/boot/loader/grub/grub.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 67daaa333e5e..2e497ff9f2c4 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -64,9 +64,10 @@ let )) + ":" + (makeSearchPathOutput "bin" "sbin" [ pkgs.mdadm pkgs.utillinux ]); - font = if lib.last (lib.splitString "." cfg.font) == "pf2" + font = if cfg.font == null then "" + else (if lib.last (lib.splitString "." cfg.font) == "pf2" then cfg.font - else "${convertedFont}"; + else "${convertedFont}"); }); bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {} From ab889c14b5228fbb1d76f61bfa9bb07558ca053c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 5 Jun 2018 10:37:38 -0400 Subject: [PATCH 35/63] install-grub: only try to loadfont if font is not null --- .../system/boot/loader/grub/install-grub.pl | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 1aa14729a75c..872261d0edfa 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -281,22 +281,24 @@ else { else insmod vbe fi - insmod font - if loadfont " . $grubBoot->path . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=keep - else - set gfxmode=$gfxmodeBios - set gfxpayload=text - fi - terminal_output gfxterm - fi "; if ($font) { copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n"; + $conf .= " + insmod font + if loadfont " . $grubBoot->path . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=keep + else + set gfxmode=$gfxmodeBios + set gfxpayload=text + fi + terminal_output gfxterm + fi + "; } if ($splashImage) { # Keeps the image's extension. From 2a0ec8b4456b7aa210d18419e816c3c8fccfe4a6 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 5 Jun 2018 19:29:34 +0200 Subject: [PATCH 36/63] ctmg: add 1.2 --- pkgs/tools/security/ctmg/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/ctmg/default.nix diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix new file mode 100644 index 000000000000..270e702cf110 --- /dev/null +++ b/pkgs/tools/security/ctmg/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ... }: + +stdenv.mkDerivation rec { + name = "ctmg-${version}"; + version = "1.2"; + + src = fetchurl { + url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz"; + sha256 = "1djxrf66abl63cybxfgjshr8avbp6nq158d0jx4mlfa3pdj32kv9"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ctmg.sh $out/bin/ctmg + ''; + + meta = with stdenv.lib; { + description = "An encrypted container manager for Linux using cryptsetup"; + homepage = https://git.zx2c4.com/ctmg/about/; + license = licenses.free; + maintainers = with maintainers; [ mrVanDalo ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8906893112d8..a3a81001b470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7816,6 +7816,8 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; + ctmg = callPackage ../tools/security/ctmg { }; + cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; From 999871400b97109c78eaf2e88fa61c6e7793e07e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 5 Jun 2018 20:29:00 +0200 Subject: [PATCH 37/63] ocamlPackages.linenoise: init at 1.1.0 (#41489) --- .../ocaml-modules/linenoise/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/linenoise/default.nix diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix new file mode 100644 index 000000000000..53ac918c47e6 --- /dev/null +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, result }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "linenoise is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-linenoise-${version}"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "fxfactorial"; + repo = "ocaml-linenoise"; + rev = "v${version}"; + sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q"; + }; + + buildInputs = [ ocaml findlib jbuilder ]; + propagatedBuildInputs = [ result ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "OCaml bindings to linenoise"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ef7e6f4c5888..3bb84e7e3a0c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -363,6 +363,8 @@ let then callPackage ../development/ocaml-modules/lambda-term { } else lambdaTerm-1_6; + linenoise = callPackage ../development/ocaml-modules/linenoise { }; + llvm = callPackage ../development/ocaml-modules/llvm { llvm = pkgs.llvm_39; }; From 3cc263ea132572ecb498b11e4baa8efb2faa3f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jos=C3=A9=20Pando?= Date: Tue, 5 Jun 2018 14:39:24 -0400 Subject: [PATCH 38/63] opendune: init at 0.9 (#41415) --- pkgs/games/opendune/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/games/opendune/default.nix diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix new file mode 100644 index 000000000000..7b848086794b --- /dev/null +++ b/pkgs/games/opendune/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer, binutils }: + +# - set the opendune configuration at ~/.config/opendune/opendune.ini: +# [opendune] +# datadir=/path/to/opendune-data +# - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php + +stdenv.mkDerivation rec { + name = "opendune-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "OpenDUNE"; + repo = "OpenDUNE"; + rev = version; + sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37"; + }; + + buildInputs = [ SDL SDL_image SDL_mixer ]; + + installPhase = '' + install -m 555 -D bin/opendune $out/bin/opendune + ''; + + meta = with stdenv.lib; { + description = "Dune, Reinvented"; + homepage = https://github.com/OpenDUNE/OpenDUNE; + license = licenses.gpl2; + maintainers = [ maintainers.nand0p ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8906893112d8..e20ee5fa6bc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1358,6 +1358,8 @@ with pkgs; meritous = callPackage ../games/meritous { }; + opendune = callPackage ../games/opendune { }; + meson = callPackage ../development/tools/build-managers/meson { }; metabase = callPackage ../servers/metabase { }; From 706cc4ac68af7a04ec2881f4127b7663f2789755 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 5 Jun 2018 22:05:11 +0300 Subject: [PATCH 39/63] ctmg: review --- pkgs/tools/security/ctmg/default.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix index 270e702cf110..1e0618412210 100644 --- a/pkgs/tools/security/ctmg/default.nix +++ b/pkgs/tools/security/ctmg/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, ... }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "ctmg-${version}"; + name = "ctmg-${version}"; version = "1.2"; - src = fetchurl { - url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz"; - sha256 = "1djxrf66abl63cybxfgjshr8avbp6nq158d0jx4mlfa3pdj32kv9"; + src = fetchzip { + url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz"; + sha256 = "1i4v8sriwjrmj3yizbl1ysckb711yl9qsn9x45jq0ij1apsydhyc"; }; - installPhase = '' - mkdir -p $out/bin - cp ctmg.sh $out/bin/ctmg - ''; + installPhase = "install -D ctmg.sh $out/bin/ctmg"; meta = with stdenv.lib; { description = "An encrypted container manager for Linux using cryptsetup"; - homepage = https://git.zx2c4.com/ctmg/about/; - license = licenses.free; + homepage = https://git.zx2c4.com/ctmg/about/; + license = licenses.isc; maintainers = with maintainers; [ mrVanDalo ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } - From d3a07d790e6d3a15894de9192af485734e67e990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 5 Jun 2018 21:38:29 +0200 Subject: [PATCH 40/63] vlc: 3.0.1 -> 3.0.3 (#41483) Besides updating the version, a patch is applied for building with QT5.11. --- pkgs/applications/video/vlc/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6cc26baf70c0..c3665daad9de 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -20,11 +20,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f"; + sha256 = "0lavzly8l0ll1d9iris9cnirgcs77g48lxj14058dxqkvd5v1a4v"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -52,6 +52,14 @@ stdenv.mkDerivation rec { # set the path to the compiler BUILDCC = "${stdenv.cc}/bin/gcc"; + patches = [ + (fetchpatch { + name = "vlc-qt5.11.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc"; + sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p"; + }) + ]; + postPatch = '' substituteInPlace configure \ --replace /bin/echo echo From 1499c812a19f6f0bf5771d57e01f9898ac54d121 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Tue, 5 Jun 2018 21:54:13 +0200 Subject: [PATCH 41/63] readline70: 7.0.3 -> 7.0.5 (#41493) --- pkgs/development/libraries/readline/readline-7.0-patches.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/readline/readline-7.0-patches.nix b/pkgs/development/libraries/readline/readline-7.0-patches.nix index 45bec6b64812..c34ef2bf97bb 100644 --- a/pkgs/development/libraries/readline/readline-7.0-patches.nix +++ b/pkgs/development/libraries/readline/readline-7.0-patches.nix @@ -4,4 +4,6 @@ patch: [ (patch "001" "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs") (patch "002" "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7") (patch "003" "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy") +(patch "004" "0r3bbaf12iz8m02z6p3fzww2m365fhn71xmzab2p62gj54s6h9gr") +(patch "005" "0lxpa4f72y2nsgj6fgrhjk2nmmxvccys6aciwfxwchb5f21rq5fa") ] From 1868fa92a2a77ae41e919777afafbf806d1f785a Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Tue, 5 Jun 2018 22:12:05 +0200 Subject: [PATCH 42/63] pythonPackages.typing-extensions: init at 3.6.5 (#40983) --- .../typing-extensions/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/typing-extensions/default.nix diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix new file mode 100644 index 000000000000..de06ddbe2ce5 --- /dev/null +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python, typing }: +let + testDir = if isPy3k then "src_py3" else "src_py2"; + +in buildPythonPackage rec { + pname = "typing_extensions"; + version = "3.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "09xxykw8mk30r0g33r2gy5qlqw3sqj5vkp6h7nh0flp59hxqw2hw"; + }; + + checkInputs = lib.optional (pythonOlder "3.5") typing; + + # Error for Python3.6: ImportError: cannot import name 'ann_module' + # See https://github.com/python/typing/pull/280 + doCheck = pythonOlder "3.6"; + + checkPhase = '' + cd ${testDir} + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Backported and Experimental Type Hints for Python 3.5+"; + homepage = https://github.com/python/typing; + license = licenses.psfl; + maintainers = with maintainers; [ pmiddend ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 032cda8aa911..ea308ca15901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12435,6 +12435,8 @@ in { typing = callPackage ../development/python-modules/typing { }; + typing-extensions = callPackage ../development/python-modules/typing-extensions { }; + typeguard = callPackage ../development/python-modules/typeguard { }; ruamel_yaml = buildPythonPackage rec { From 186675b06f1a5efe3439c351fe69b7dd6a9a8878 Mon Sep 17 00:00:00 2001 From: leenaars Date: Tue, 5 Jun 2018 22:31:08 +0200 Subject: [PATCH 43/63] pdf-redact-tools: init -> 0.1.2 (#41451) --- .../tools/graphics/pdfredacttools/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/graphics/pdfredacttools/default.nix diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix new file mode 100644 index 000000000000..d66c0b0a9451 --- /dev/null +++ b/pkgs/tools/graphics/pdfredacttools/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pythonPackages, imagemagick, exiftool, file, ghostscript }: + +pythonPackages.buildPythonApplication rec { + pname = "pdf-redact-tools"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "firstlookmedia"; + repo = pname; + rev = "v${version}"; + sha256 = "01vs1bc0pfgk6x2m36vwra605fg59yc31d0hl9jmj86n8q6wwvss"; + }; + + patchPhase = ''substituteInPlace pdf-redact-tools \ + --replace \'convert\' \'${imagemagick}/bin/convert\' \ + --replace \'exiftool\' \'${exiftool}/bin/exiftool\' \ + --replace \'file\' \'${file}/bin/file\' + ''; + + propagatedBuildInputs = [ imagemagick exiftool ghostscript ]; + + meta = with stdenv.lib; { + description = "Redact and strip metadata from documents before publishing"; + longDescription = '' + PDF Redact Tools helps with securely redacting and stripping metadata + from documents before publishing. Note that this is not a security tool. + It uses ImageMagick to parse PDFs. While ImageMagick is a versatile tool, it has + a history of several security bugs. A malicious PDF could exploit a bug in + ImageMagick to take over your computer. If you're working with potentially + malicious PDFs, it's safest to run them through PDF Redact Tools in an isolated + environment, such as a virtual machine, or by using a tool such as the Qubes + PDF Converter instead. + ''; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65de40b046c1..dc29d48760b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4376,6 +4376,8 @@ with pkgs; pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; + pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; fmodex = callPackage ../games/zandronum/fmod.nix { }; From 16845d61e8b97a6f955eb65aff30a87dc2f33c68 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 Jun 2018 23:43:17 +0300 Subject: [PATCH 44/63] mc: 4.8.20 -> 4.8.21 (#41496) --- pkgs/tools/misc/mc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index bc097e2a0857..bdae1e0cf848 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.20"; + version = "4.8.21"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1"; + sha256 = "130lzrcmazinznnnpf00lcizdlmjdhfiqfx00g1cjcbwmi3fadwg"; }; nativeBuildInputs = [ pkgconfig ]; From 44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Mon, 21 May 2018 17:44:15 +0200 Subject: [PATCH 45/63] faust2: fix build with llvm 5.0.2 (#40672) build was broken by llvm: 5.0.1 -> 5.0.2 (#39979) (cherry picked from commit a16c31244b904cb0ee152eca2c0c01c3be0fdc7f) --- pkgs/applications/audio/faust/faust2.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index db5433cc35fc..961ef7135697 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -73,6 +73,13 @@ let sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix ''; + postPatch = '' + # fix build with llvm 5.0.2 by adding it to the list of known versions + # TODO: check if still needed on next update + substituteInPlace compiler/Makefile.unix \ + --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2" + ''; + # Remove most faust2appl scripts since they won't run properly # without additional paths setup. See faust.wrap, # faust.wrapWithBuildEnv. @@ -193,6 +200,7 @@ let propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + postFixup = '' # export parts of the build environment From 9aba987f37dd3ea775b63de9b0257ead8e7b719a Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Tue, 5 Jun 2018 23:56:17 +0200 Subject: [PATCH 46/63] bat: support darwin --- pkgs/tools/misc/bat/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 7a3231ce85c2..01fbe67e5f20 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "bat-${version}"; @@ -15,11 +15,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkgconfig zlib ]; + buildInputs = [ libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = https://github.com/sharkdp/bat; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 96ea550a3bc4ab6f1e675c48fc0a4b03c9e9dbb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 15:13:26 -0700 Subject: [PATCH 47/63] snd: 18.3 -> 18.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/snd/versions. These checks were done: - built on NixOS - /nix/store/mjj4w55zxs6frv2k1jwwj6prfvc5khq8-snd-18.4/bin/snd passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 18.4 with grep in /nix/store/mjj4w55zxs6frv2k1jwwj6prfvc5khq8-snd-18.4 - directory tree listing: https://gist.github.com/3273a4d6d644822345c927f1c5898be3 - du listing: https://gist.github.com/990100affe939370c541757ed1ee0839 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index cacc6e04429d..9b386ea7ac7e 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.3"; + name = "snd-18.4"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss"; + sha256 = "1asc513d0cmbq0ldzpzmfbydvlj5hwpp480qnicgkn96wplp9c7s"; }; nativeBuildInputs = [ pkgconfig ]; From 26c194d000d641ddf2d892157ab2a520baa2a83f Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Tue, 5 Jun 2018 23:50:28 +0100 Subject: [PATCH 48/63] pythonPackages.pykdtree: init at 1.3.0 (#41355) --- .../python-modules/pykdtree/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pykdtree/default.nix diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix new file mode 100644 index 000000000000..86524b6002d6 --- /dev/null +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }: + +buildPythonPackage rec { + pname = "pykdtree"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "79351b79087f473f83fb27a5cd552bd1056f2dfa7acec5d4a68f35a7cbea6776"; + }; + + buildInputs = [ openmp ]; + + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "kd-tree implementation for fast nearest neighbour search in Python"; + homepage = https://github.com/storpipfugl/pykdtree; + license = licenses.lgpl3; + maintainers = with maintainers; [ psyanticy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea308ca15901..2c4ab7805bda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -384,6 +384,10 @@ in { callPackage = pkgs.callPackage; }; + pykdtree = callPackage ../development/python-modules/pykdtree { + inherit (pkgs.llvmPackages) openmp; + }; + pyparser = callPackage ../development/python-modules/pyparser { }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { From f2d7142b33168aafde2bc030d2a31107b52aef54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 15:55:06 -0700 Subject: [PATCH 49/63] syncthing: 0.14.47 -> 0.14.48 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/syncthing/versions. These checks were done: - built on NixOS - /nix/store/h4ya458k1kcphch5pxzm16v38l07qv7r-syncthing-0.14.48/bin/syncthing passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.14.48 with grep in /nix/store/h4ya458k1kcphch5pxzm16v38l07qv7r-syncthing-0.14.48 - directory tree listing: https://gist.github.com/ba1db3154a5999b389aae4932af21f2b - du listing: https://gist.github.com/a469360f23a2909c7550178ab7a1d0f2 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e1a2cf8d1716..25d482fd9b06 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.47"; + version = "0.14.48"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1md835c13f3c9bknnm6pxn0r8k8g2wg56zfav96bpnpk4aqx41bh"; + sha256 = "10jls0z3y081fq097xarplzv5sz076ibhawzm65bq695f6s5sdzw"; }; inherit patches; From e14fa60cb61e285258c202762e7a102add8a42f1 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Jun 2018 11:22:23 +0900 Subject: [PATCH 50/63] flent: fix fetchFromGitHub version Lacked a "v" in revision. --- pkgs/applications/networking/flent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 9a0bb0104d4c..90ff868d6bec 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -6,8 +6,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "tohojo"; repo = "flent"; - rev = version; - sha256 = "0rl4ahynl6ymw7r04vpg9p90pplrxc41rjlzvm0swxsvpw40yvkm"; + rev = "v${version}"; + sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r"; }; buildInputs = [ netperf ]; From 13170a9694fc7b77501425b20c50e8d3b7221f45 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jun 2018 03:39:14 +0000 Subject: [PATCH 51/63] Revert "libbsd-freedesktop: re-init at 0.9.1, use for samba" This reverts commit 8b5ed12952300846928555b20fc10893f9df3965. --- pkgs/development/libraries/libbsd/default.nix | 21 ------------------- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/libraries/libbsd/default.nix diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix deleted file mode 100644 index 114d3209b58a..000000000000 --- a/pkgs/development/libraries/libbsd/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libbsd-${version}"; - version = "0.9.1"; - - src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n"; - }; - - patches = []; - - meta = with stdenv.lib; { - description = "Common functions found on BSD systems, Freedesktop fork"; - homepage = https://libbsd.freedesktop.org/; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ raskin ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc29d48760b8..c700f37fed9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12963,7 +12963,6 @@ with pkgs; samba4 = callPackage ../servers/samba/4.x.nix { python = python2; - libbsd = libbsd-freedesktop; }; sambaMaster = callPackage ../servers/samba/master.nix { }; @@ -21532,8 +21531,6 @@ with pkgs; libbsd = netbsd.compat; - libbsd-freedesktop = callPackage ../development/libraries/libbsd {}; - inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd; From f2682af9c9777068933c863065bf02b8d72706a6 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jun 2018 04:07:54 +0000 Subject: [PATCH 52/63] Revert "opendkim: fix libbsd dependency" This reverts commit b529dda3a19856cb2c1a26db0f0d2e0f6d268861. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c700f37fed9c..c537cdf8bc77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4162,9 +4162,7 @@ with pkgs; opendht = callPackage ../development/libraries/opendht {}; - opendkim = callPackage ../development/libraries/opendkim { - libbsd = libbsd-freedesktop; - }; + opendkim = callPackage ../development/libraries/opendkim { }; opendylan = callPackage ../development/compilers/opendylan { opendylan-bootstrap = opendylan_bin; From 05fedecad9db7f06385d26b60e6353c7edc7d56a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jun 2018 03:43:49 +0000 Subject: [PATCH 53/63] Revert "libbsd: replace with nbcompat" This reverts commit 480434f7eeefed7026dbbd11a4a0b1e4bfc1f137. netbsd.compat does not provide include files that are provided by libbsd [1], and it encumbers its transitive dependents with an obligatory include file that setups BSD-compatible C environment [2]. [1] https://github.com/NixOS/nixpkgs/pull/41320#issuecomment-394922277 [2] https://github.com/NixOS/nixpkgs/pull/41320#issuecomment-394928845 --- pkgs/development/libraries/libbsd/cdefs.patch | 222 ++++++ .../development/libraries/libbsd/darwin.patch | 703 ++++++++++++++++++ pkgs/development/libraries/libbsd/default.nix | 34 + .../libraries/libbsd/features.patch | 26 + .../libraries/libbsd/non-glibc.patch | 74 ++ pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 1061 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libbsd/cdefs.patch create mode 100644 pkgs/development/libraries/libbsd/darwin.patch create mode 100644 pkgs/development/libraries/libbsd/default.nix create mode 100644 pkgs/development/libraries/libbsd/features.patch create mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch new file mode 100644 index 000000000000..81822654aeb4 --- /dev/null +++ b/pkgs/development/libraries/libbsd/cdefs.patch @@ -0,0 +1,222 @@ +From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:41:35 +0100 +Subject: Handle systems missing + +This is a non-portable header, and we cannot expect it to be provided by +the system libc (e.g. musl). We just need and rely on declaration that +we have defined ourselves in our own . So we switch to +only ever assume that. + +Fixes: https://bugs.freedesktop.org/105281 +--- + include/bsd/libutil.h | 4 ++++ + include/bsd/md5.h | 4 ++++ + include/bsd/nlist.h | 4 ++++ + include/bsd/readpassphrase.h | 4 ++++ + include/bsd/stdlib.h | 4 ++++ + include/bsd/string.h | 4 ++++ + include/bsd/stringlist.h | 5 +++++ + include/bsd/sys/queue.h | 4 ++++ + include/bsd/sys/tree.h | 4 ++++ + include/bsd/timeconv.h | 4 ++++ + include/bsd/vis.h | 4 ++++ + include/bsd/wchar.h | 4 ++++ + 12 files changed, 49 insertions(+) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index 45b3b15..ccca29a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -40,7 +40,11 @@ + #define LIBBSD_LIBUTIL_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + #include +diff --git a/include/bsd/md5.h b/include/bsd/md5.h +index 5f3ae46..bf36a30 100644 +--- a/include/bsd/md5.h ++++ b/include/bsd/md5.h +@@ -27,7 +27,11 @@ typedef struct MD5Context { + uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + } MD5_CTX; + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h +index cb297e8..8767117 100644 +--- a/include/bsd/nlist.h ++++ b/include/bsd/nlist.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_NLIST_H + #define LIBBSD_NLIST_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + struct nlist { + union { +diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h +index 14744b8..5eb8021 100644 +--- a/include/bsd/readpassphrase.h ++++ b/include/bsd/readpassphrase.h +@@ -31,7 +31,11 @@ + #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ + #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index ebc9638..8d33d1f 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -42,7 +42,11 @@ + #ifndef LIBBSD_STDLIB_H + #define LIBBSD_STDLIB_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 6798bf6..29097f6 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_STRING_H + #define LIBBSD_STRING_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h +index ff30cac..dd71496 100644 +--- a/include/bsd/stringlist.h ++++ b/include/bsd/stringlist.h +@@ -31,7 +31,12 @@ + + #ifndef LIBBSD_STRINGLIST_H + #define LIBBSD_STRINGLIST_H ++ ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + /* +diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h +index 4a94ea7..ac00026 100644 +--- a/include/bsd/sys/queue.h ++++ b/include/bsd/sys/queue.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_SYS_QUEUE_H + #define LIBBSD_SYS_QUEUE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines four types of data structures: singly-linked lists, +diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h +index 628bec0..325b382 100644 +--- a/include/bsd/sys/tree.h ++++ b/include/bsd/sys/tree.h +@@ -30,7 +30,11 @@ + #ifndef LIBBSD_SYS_TREE_H + #define LIBBSD_SYS_TREE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines data structures for different types of trees: +diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h +index e2a2c55..a426bd3 100644 +--- a/include/bsd/timeconv.h ++++ b/include/bsd/timeconv.h +@@ -41,7 +41,11 @@ + #ifndef LIBBSD_TIMECONV_H + #define LIBBSD_TIMECONV_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/vis.h b/include/bsd/vis.h +index 970dfdd..ab5430c 100644 +--- a/include/bsd/vis.h ++++ b/include/bsd/vis.h +@@ -72,7 +72,11 @@ + */ + #define UNVIS_END 1 /* no more characters */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + __BEGIN_DECLS + char *vis(char *, int, int, int); +diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h +index 33a500e..7216503 100644 +--- a/include/bsd/wchar.h ++++ b/include/bsd/wchar.h +@@ -40,7 +40,11 @@ + #define LIBBSD_WCHAR_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch new file mode 100644 index 000000000000..4bddec6b0ffd --- /dev/null +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -0,0 +1,703 @@ +diff --git a/configure.ac b/configure.ac +index 88ccd91..0857782 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -59,7 +59,7 @@ AS_CASE([$host_os], + ) + + # Checks for header files. +-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) ++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE +@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ + pstat_getproc sysconf]) + AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) + ++HostOS=`echo "$host" | sed 's/.*-//'` ++os_is_macosx=false ++nonLinuxOS=false ++AC_SUBST(HostOS) ++case ${HostOS} in ++ darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*) ++ os_is_macosx=true ++ nonLinuxOS=true ++ echo HostOS="$HostOS" ++ ;; ++ *) ++ echo host="$host" ++ echo HostOS="$HostOS" ++ os_is_macosx=false ++ nonLinuxOS=false ++ ;; ++esac ++AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue]) ++AM_COND_IF([IS_DARWIN], ++ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])]) ++ ++AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue]) ++AM_COND_IF([NON_LINUX], ++ [AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])]) ++ + AC_CONFIG_FILES([ + Makefile + include/Makefile +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index 45b3b15..d0d4043 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -39,7 +39,9 @@ + #ifndef LIBBSD_LIBUTIL_H + #define LIBBSD_LIBUTIL_H + ++#ifdef HAVE_FEATURES_H + #include ++#endif + #include + #include + #include +diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h +index 4b69983..c75151b 100644 +--- a/include/bsd/stdio.h ++++ b/include/bsd/stdio.h +@@ -48,12 +48,16 @@ + __BEGIN_DECLS + const char *fmtcheck(const char *, const char *); + ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + /* XXX: The function requires cooperation from the system libc to store the + * line buffer in the FILE struct itself. */ + char *fgetln(FILE *fp, size_t *lenp) +- LIBBSD_DEPRECATED("This functions cannot be safely ported, " +- "use getline(3) instead, as it is supported " +- "by GNU and POSIX.1-2008."); ++ __attribute__((deprecated("This functions cannot be safely ported, " ++ "use getline(3) instead, as it is supported " ++ "by GNU and POSIX.1-2008."))); ++#else ++char *fgetln(FILE *fp, size_t *lenp); ++#endif + + /* + * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations, +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index ebc9638..6cd7943 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) ++#if !__GLIBC_PREREQ(2, 26) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif ++#endif + + long long strtonum(const char *nptr, long long minval, long long maxval, + const char **errstr); +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 6798bf6..6baaa14 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -37,6 +37,12 @@ + #include + + __BEGIN_DECLS ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++size_t bsd_strlcpy(char *dst, const char *src, size_t siz); ++size_t bsd_strlcat(char *dst, const char *src, size_t siz); ++char *bsd_strnstr(const char *str, const char *find, size_t str_len); ++void bsd_strmode(mode_t mode, char *str); ++#else + size_t strlcpy(char *dst, const char *src, size_t siz); + size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); +@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str); + #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) + void explicit_bzero(void *buf, size_t len); + #endif ++#endif + __END_DECLS + + #endif +diff --git a/src/Makefile.am b/src/Makefile.am +index ad83dbf..0f2a7ee 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \ + libbsd.map + libbsd_la_LIBADD = \ + $(CLOCK_GETTIME_LIBS) ++ ++if IS_DARWIN ++libbsd_la_LDFLAGS = \ ++ -Wl \ ++ -version-number $(LIBBSD_ABI) ++else + libbsd_la_LDFLAGS = \ + -Wl,--version-script=$(srcdir)/libbsd.map \ + -version-number $(LIBBSD_ABI) ++endif ++ + libbsd_la_SOURCES = \ + arc4random.c \ +- arc4random.h \ +- arc4random_unix.h \ +- arc4random_openbsd.h \ + arc4random_uniform.c \ + bsd_getopt.c \ +- chacha_private.h \ + closefrom.c \ + dehumanize_number.c \ + err.c \ +@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \ + $(nil) + endif + ++noinst_HEADERS = \ ++ arc4random.h \ ++ arc4random_bsd.h \ ++ arc4random_linux.h \ ++ arc4random_unix.h \ ++ arc4random_osx.h \ ++ arc4random_openbsd.h \ ++ chacha_private.h ++ + libbsd_ctor_a_SOURCES = \ + setproctitle_ctor.c \ + $(nil) +diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h +new file mode 100644 +index 0000000..ece2f85 +--- /dev/null ++++ b/src/arc4random_bsd.h +@@ -0,0 +1,86 @@ ++/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996, David Mazieres ++ * Copyright (c) 2008, Damien Miller ++ * Copyright (c) 2013, Markus Friedl ++ * Copyright (c) 2014, Theo de Raadt ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* ++ * Stub functions for portability. ++ */ ++ ++#include ++ ++#include ++#include ++ ++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; ++#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) ++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) ++ ++/* ++ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if ++ * a program does not link to -lthr. Callbacks registered with pthread_atfork() ++ * appear to fail silently. So, it is not always possible to detect a PID ++ * wraparound. ++ */ ++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) ++ ++static inline void ++_getentropy_fail(void) ++{ ++ raise(SIGKILL); ++} ++ ++static volatile sig_atomic_t _rs_forked; ++ ++static inline void ++_rs_forkhandler(void) ++{ ++ _rs_forked = 1; ++} ++ ++static inline void ++_rs_forkdetect(void) ++{ ++ static pid_t _rs_pid = 0; ++ pid_t pid = getpid(); ++ ++ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { ++ _rs_pid = pid; ++ _rs_forked = 0; ++ if (rs) ++ memset(rs, 0, sizeof(*rs)); ++ } ++} ++ ++static inline int ++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) ++{ ++ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) ++ return (-1); ++ ++ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { ++ munmap(*rsp, sizeof(**rsp)); ++ return (-1); ++ } ++ ++ _ARC4_ATFORK(_rs_forkhandler); ++ return (0); ++} +diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h +new file mode 100644 +index 0000000..d61a8db +--- /dev/null ++++ b/src/arc4random_linux.h +@@ -0,0 +1,86 @@ ++/* $OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996, David Mazieres ++ * Copyright (c) 2008, Damien Miller ++ * Copyright (c) 2013, Markus Friedl ++ * Copyright (c) 2014, Theo de Raadt ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* ++ * Stub functions for portability. ++ */ ++ ++#include ++ ++#include ++#include ++ ++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; ++#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) ++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) ++ ++#ifdef __GLIBC__ ++extern void *__dso_handle; ++extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); ++#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle) ++#else ++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) ++#endif ++ ++static inline void ++_getentropy_fail(void) ++{ ++ raise(SIGKILL); ++} ++ ++static volatile sig_atomic_t _rs_forked; ++ ++static inline void ++_rs_forkhandler(void) ++{ ++ _rs_forked = 1; ++} ++ ++static inline void ++_rs_forkdetect(void) ++{ ++ static pid_t _rs_pid = 0; ++ pid_t pid = getpid(); ++ ++ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { ++ _rs_pid = pid; ++ _rs_forked = 0; ++ if (rs) ++ memset(rs, 0, sizeof(*rs)); ++ } ++} ++ ++static inline int ++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) ++{ ++ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) ++ return (-1); ++ ++ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { ++ munmap(*rsp, sizeof(**rsp)); ++ return (-1); ++ } ++ ++ _ARC4_ATFORK(_rs_forkhandler); ++ return (0); ++} +diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h +new file mode 100644 +index 0000000..14771a6 +--- /dev/null ++++ b/src/arc4random_osx.h +@@ -0,0 +1,82 @@ ++/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996, David Mazieres ++ * Copyright (c) 2008, Damien Miller ++ * Copyright (c) 2013, Markus Friedl ++ * Copyright (c) 2014, Theo de Raadt ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* ++ * Stub functions for portability. ++ */ ++ ++#include ++ ++#include ++#include ++#include ++ ++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; ++#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) ++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) ++ ++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) ++ ++static inline void ++_getentropy_fail(void) ++{ ++ raise(SIGKILL); ++} ++ ++static volatile sig_atomic_t _rs_forked; ++ ++static inline void ++_rs_forkhandler(void) ++{ ++ _rs_forked = 1; ++} ++ ++static inline void ++_rs_forkdetect(void) ++{ ++ static pid_t _rs_pid = 0; ++ pid_t pid = getpid(); ++ ++ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { ++ _rs_pid = pid; ++ _rs_forked = 0; ++ if (rs) ++ memset(rs, 0, sizeof(*rs)); ++ } ++} ++ ++static inline int ++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) ++{ ++ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) ++ return (-1); ++ ++ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { ++ munmap(*rsp, sizeof(**rsp)); ++ *rsp = NULL; ++ return (-1); ++ } ++ ++ _ARC4_ATFORK(_rs_forkhandler); ++ return (0); ++} +diff --git a/src/fgetln.c b/src/fgetln.c +index 4d1726e..9c73788 100644 +--- a/src/fgetln.c ++++ b/src/fgetln.c +@@ -30,7 +30,9 @@ + #include + #include + ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + #include "local-link.h" ++#endif + + #ifdef HAVE_GETLINE + struct filebuf { +@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len) + return fb->buf; + } + } ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + libbsd_link_warning(fgetln, + "This functions cannot be safely ported, use getline(3) " + "instead, as it is supported by GNU and POSIX.1-2008.") ++#endif + #else + #error "Function fgetln() needs to be ported." + #endif +diff --git a/src/fpurge.c b/src/fpurge.c +index 462535a..e7eb46f 100644 +--- a/src/fpurge.c ++++ b/src/fpurge.c +@@ -26,9 +26,11 @@ + + #include + #include ++#if HAVE___FPURGE + #include ++#endif + +-#ifdef HAVE___FPURGE ++#ifdef HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ + int + fpurge(FILE *fp) + { +@@ -42,5 +44,55 @@ fpurge(FILE *fp) + return 0; + } + #else +-#error "Function fpurge() needs to be ported." ++#define fp_ fp ++//#error "Function fpurge() needs to be ported." ++//#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ ++int ++fpurge(FILE *fp) ++{ ++ if (fp == NULL || fileno(fp) < 0) { ++ errno = EBADF; ++ return EOF; ++ } ++ ++ /* Call the system's fpurge function. */ ++# undef fpurge ++# if !HAVE_DECL_FPURGE ++ extern int fpurge (FILE *); ++# endif ++ int result = fpurge (fp); ++# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++ if (result == 0) ++ /* Correct the invariants that fpurge broke. ++ on BSD systems says: ++ "The following always hold: if _flags & __SRD, _w is 0." ++ If this invariant is not fulfilled and the stream is read-write but ++ currently reading, subsequent putc or fputc calls will write directly ++ into the buffer, although they shouldn't be allowed to. */ ++ if ((fp_->_flags & __SRD) != 0) ++ fp_->_w = 0; ++#endif ++ return result; ++} ++//#endif ++#endif ++ ++#ifdef TEST ++int ++main() ++{ ++ static FILE fp_bad; ++ FILE *fp; ++ ++ if (fpurge(&fp_bad) == 0) ++ return 1; ++ ++ fp = fopen("/dev/zero", "r"); ++ if (fpurge(fp) < 0) ++ return 1; ++ ++ fclose(fp); ++ ++ return 0; ++} + #endif +diff --git a/src/funopen.c b/src/funopen.c +index 1e05c7e..75e61ea 100644 +--- a/src/funopen.c ++++ b/src/funopen.c +@@ -143,6 +143,7 @@ funopen(const void *cookie, + * they will not add the needed support to implement it. Just ignore this + * interface there, as it has never been provided anyway. + */ ++#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) + #else + #error "Function funopen() needs to be ported or disabled." + #endif +diff --git a/src/getentropy.c b/src/getentropy.c +index 3f11a1e..8a23a07 100644 +--- a/src/getentropy.c ++++ b/src/getentropy.c +@@ -28,9 +28,7 @@ + #include "getentropy_linux.c" + #elif defined(__GNU__) + #include "getentropy_hurd.c" +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +-#include "getentropy_bsd.c" +-#elif defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + #include "getentropy_bsd.c" + #elif defined(__sun) + #include "getentropy_solaris.c" +diff --git a/src/hash/sha512.h b/src/hash/sha512.h +index 4f368a1..ab22fc1 100644 +--- a/src/hash/sha512.h ++++ b/src/hash/sha512.h +@@ -29,7 +29,11 @@ + #ifndef _SHA512_H_ + #define _SHA512_H_ + ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#include ++#else + #include ++#endif + + #define SHA512_DIGEST_LENGTH 64 + +diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c +index b3c8d5e..f69013d 100644 +--- a/src/hash/sha512c.c ++++ b/src/hash/sha512c.c +@@ -25,7 +25,13 @@ + */ + + #include ++__FBSDID("$FreeBSD$"); ++ ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#include ++#else + #include ++#endif + #include + + #include +diff --git a/src/nlist.c b/src/nlist.c +index 0932f59..598a329 100644 +--- a/src/nlist.c ++++ b/src/nlist.c +@@ -27,6 +27,10 @@ + * SUCH DAMAGE. + */ + ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) ++#if defined(LIBC_SCCS) && !defined(lint) ++static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; ++#endif /* LIBC_SCCS and not lint */ + #include + + #include +@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list) + (void)close(fd); + return (n); + } ++#endif /* _NLIST_DO_ELF */ +diff --git a/src/setproctitle.c b/src/setproctitle.c +index 038ac7d..d0ef01b 100644 +--- a/src/setproctitle.c ++++ b/src/setproctitle.c +@@ -32,6 +32,11 @@ + #include + #include + ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#define __asm__(x) ++extern char **environ; ++#endif ++ + static struct { + /* Original value. */ + const char *arg0; +@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); + * for code linking against that version, and change the default to use the + * new version, so that new code depends on the implemented version. */ + #ifdef HAVE_TYPEOF ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++// ++// HACK: even weak aliasing breaks in clang so just comment this out for now ++// ++// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl"))); ++#else + extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl"))); ++#endif + #else + void setproctitle_stub(const char *fmt, ...) + __attribute__((alias("setproctitle_impl"))); +diff --git a/src/strlcat.c b/src/strlcat.c +index 14c53a1..e01cb60 100644 +--- a/src/strlcat.c ++++ b/src/strlcat.c +@@ -27,7 +27,11 @@ + * If retval >= dsize, truncation occurred. + */ + size_t ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++bsd_strlcat(char *dst, const char *src, size_t dsize) ++#else + strlcat(char *dst, const char *src, size_t dsize) ++#endif + { + const char *odst = dst; + const char *osrc = src; +diff --git a/src/strlcpy.c b/src/strlcpy.c +index e9a7fe4..10a855f 100644 +--- a/src/strlcpy.c ++++ b/src/strlcpy.c +@@ -25,7 +25,11 @@ + * Returns strlen(src); if retval >= dsize, truncation occurred. + */ + size_t ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++bsd_strlcpy(char *dst, const char *src, size_t dsize) ++#else + strlcpy(char *dst, const char *src, size_t dsize) ++#endif + { + const char *osrc = src; + size_t nleft = dsize; +diff --git a/src/strmode.c b/src/strmode.c +index e6afde5..c463243 100644 +--- a/src/strmode.c ++++ b/src/strmode.c +@@ -33,7 +33,11 @@ + #include + + void ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++bsd_strmode(mode_t mode, char *p) ++#else + strmode(mode_t mode, char *p) ++#endif + { + /* print type */ + switch (mode & S_IFMT) { diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix new file mode 100644 index 000000000000..ff9412ceb580 --- /dev/null +++ b/pkgs/development/libraries/libbsd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libbsd-${version}"; + version = "0.8.7"; + + src = fetchurl { + url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; + }; + + # darwin changes configure.ac which means we need to regenerate + # the configure scripts + nativeBuildInputs = [ autoreconfHook ]; + + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch + # Suitable for all, but limited to musl to avoid rebuilds + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 + ./non-glibc.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd + ./cdefs.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404 + ./features.patch + ]; + + meta = with stdenv.lib; { + description = "Common functions found on BSD systems"; + homepage = https://libbsd.freedesktop.org/; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch new file mode 100644 index 000000000000..66bd1e9232ba --- /dev/null +++ b/pkgs/development/libraries/libbsd/features.patch @@ -0,0 +1,26 @@ +From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:42:52 +0100 +Subject: Remove inclusion from + +This is a non-portable header, and we should not assume it is present. +Let the first system header pull it in if needed. +--- + include/bsd/libutil.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index ccca29a..e5f148a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -39,7 +39,6 @@ + #ifndef LIBBSD_LIBUTIL_H + #define LIBBSD_LIBUTIL_H + +-#include + #ifdef LIBBSD_OVERLAY + #include + #else +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch new file mode 100644 index 000000000000..f61e0d242943 --- /dev/null +++ b/pkgs/development/libraries/libbsd/non-glibc.patch @@ -0,0 +1,74 @@ +From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:39:45 +0100 +Subject: Fix function declaration protection for glibc already providing them +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On non-glibc based systems we cannot unconditionally use the +__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, +if it is undefined, define it to 0. + +We should also always declare these functions on non-glibc based +systems. And on systems with a new enough glibc, which provides these +functions, we should still provide the declarations if _GNU_SOURCE +is *not* defined. + +Reported-by: Jörg Krause +--- + include/bsd/stdlib.h | 3 ++- + include/bsd/string.h | 3 ++- + include/bsd/sys/cdefs.h | 8 ++++++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index 8d33d1f..a5b063c 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 29097f6..f987fee 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); + void strmode(mode_t mode, char *str); + +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) + void explicit_bzero(void *buf, size_t len); + #endif + __END_DECLS +diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h +index b4c8f30..d1cc419 100644 +--- a/include/bsd/sys/cdefs.h ++++ b/include/bsd/sys/cdefs.h +@@ -59,6 +59,14 @@ + #endif + + /* ++ * On non-glibc based systems, we cannot unconditionally use the ++ * __GLIBC_PREREQ macro as it gets expanded before evaluation. ++ */ ++#ifndef __GLIBC_PREREQ ++#define __GLIBC_PREREQ(maj, min) 0 ++#endif ++ ++/* + * Some kFreeBSD headers expect those macros to be set for sanity checks. + */ + #ifndef _SYS_CDEFS_H_ +-- +cgit v1.1 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c537cdf8bc77..99c3324e0673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2384,6 +2384,8 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; + libbsd = callPackage ../development/libraries/libbsd { }; + libbladeRF = callPackage ../development/libraries/libbladeRF { }; lp_solve = callPackage ../applications/science/math/lp_solve { }; @@ -21527,8 +21529,6 @@ with pkgs; fts = if hostPlatform.isMusl then netbsd.fts else null; - libbsd = netbsd.compat; - inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd; From a1df64bab5492eb481baed7aab67eb1cdc439617 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 21:43:54 -0700 Subject: [PATCH 54/63] qrencode: 4.0.0 -> 4.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qrencode/versions. These checks were done: - built on NixOS - /nix/store/b6r4hmimplv6bb9c6hifz12fviffv7sy-qrencode-4.0.1/bin/qrencode passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 4.0.1 with grep in /nix/store/b6r4hmimplv6bb9c6hifz12fviffv7sy-qrencode-4.0.1 - directory tree listing: https://gist.github.com/baadc6a6ea64d66edc20bd100d9f2c44 - du listing: https://gist.github.com/c734323c8b2a2924e59912df5f75be0d --- pkgs/tools/graphics/qrencode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index a83e38e577dd..5620f5058a5f 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, pkgconfig }: stdenv.mkDerivation rec { - name = "qrencode-4.0.0"; + name = "qrencode-4.0.1"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069"; + sha256 = "0j7cqhjc0l6i99lzph51gakmcmfs74x483plna93r4ngz328knph"; }; buildInputs = [ libpng ]; From e32cdcb7e6250dcc555fe1ac38197cfcb37954be Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 6 Jun 2018 00:20:15 -0500 Subject: [PATCH 55/63] gnuplot: 5.2.3 -> 5.2.4 (#41505) http://www.gnuplot.info/ReleaseNotes_5_2_4.html --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index b2b8508640bf..0a4ebf495b24 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -20,11 +20,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.3"; + name = "gnuplot-5.2.4"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "0977vgjszjpqhz2jahq07zmcmi0k9d6v7wq70ph2klfrb29qrdgy"; + sha256 = "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; From 0a016775338f62843a14bcd21499b1b9b3c521b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 23:27:07 -0700 Subject: [PATCH 56/63] wireless-regdb: 2018.05.09 -> 2018.05.31 (#41502) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireless-regdb/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/eb0bfbd5021737ca480ef0988bdb7c0b - du listing: https://gist.github.com/bef51cf6379ac49345c3a945c0d86181 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 0805a62b15e0..b386b18e69e2 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2018.05.09"; + version = "2018.05.31"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "0db4p8m194cjydrv9q7ygx62v202sighb9pizbn8a29anvm0cmzd"; + sha256 = "0yxydxkmcb6iryrbazdk8lqqibig102kq323gw3p64vpjwxvrpz1"; }; dontBuild = true; From 52e3ce6107825dfaf1a9ad4669ea874b184f5131 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 23:31:02 -0700 Subject: [PATCH 57/63] renpy: 6.99.14.3 -> 7.0.0 (#41515) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/renpy/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/ahy8smyhk0l4jhca9gnzvw7pgl82aw0z-renpy-7.0.0/bin/renpy had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 7.0.0 with grep in /nix/store/ahy8smyhk0l4jhca9gnzvw7pgl82aw0z-renpy-7.0.0 - directory tree listing: https://gist.github.com/d2bcdfe97ec6d25a85ed5c0960610062 - du listing: https://gist.github.com/a9cf861b24bbd391732cfc7a596b829a --- pkgs/development/interpreters/renpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index a992717d94f3..220aa9abe558 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "6.99.14.3"; + version = "7.0.0"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "15n29ybblcpnfbmhc31gm5vj7cpqd8cwrcqxlwnxy0gjpbc50x73"; + sha256 = "0yrwp5iw4fjg7kbd041qv8gh2p0dnbrnkrgmn0ndk5k10pjij82g"; }; patches = [ From e28ebcf8d71142f5e2fe2dd66bfb71d5fd4c7a99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 23:35:10 -0700 Subject: [PATCH 58/63] pmd: 6.3.0 -> 6.4.0 (#41529) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pmd/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/bgastviewer.bat had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/cpdgui.bat had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/designer.bat had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/pmd.bat had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/cpd.bat had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/run.sh had a zero exit code or showed the expected version - 0 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 6.4.0 with grep in /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0 - directory tree listing: https://gist.github.com/c371521af22489a6f711d026a7ae6ca8 - du listing: https://gist.github.com/c80d6292115b6f1817e4c877e3b840a9 --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 6f908128e599..e738d30543ed 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.3.0"; + version = "6.4.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "09x6mpqz4z583lvliipkmvlv3qmmwi7zjzgfjhwyp27faf2pz1ym"; + sha256 = "17yjjmqcn1fy3bj73nh5i84yc7wappza612a0iwg0lqqn4yl7lyn"; }; installPhase = '' From 231bcd3555817afc02476d6372ac0d35c462405d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 23:36:30 -0700 Subject: [PATCH 59/63] pkcs11helper: 1.22 -> 1.23 (#41530) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pkcs11-helper/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.23 with grep in /nix/store/njd3rr6rvfss4xm4slpj7pxcp7ydlkxx-pkcs11-helper-1.23 - directory tree listing: https://gist.github.com/dfd004f45e4a3e63bf0656538040eb38 - du listing: https://gist.github.com/197b03678f9126503098e42ad217a12b --- pkgs/development/libraries/pkcs11helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 1a1bb1800cf2..0c5d5e22e696 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "01v3zv6sr5phqhr2f21fl2rmcnmkp9518dkq82g1v2y9ysjksg7q"; + sha256 = "1m3fp3v6c903cs36bvvg0h65p1sdamsmzy13ww0zyvplcycarz0n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 46dfe1eca806defde9a13fb8a94254ba5b086f7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Jun 2018 23:37:08 -0700 Subject: [PATCH 60/63] osinfo-db: 20180514 -> 20180531 (#41532) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 20180531 with grep in /nix/store/25851x07kvaxfb8s7427mhpvylj8swg1-osinfo-db-20180531 - directory tree listing: https://gist.github.com/60bc6cf4445cc0ea32c19263635f4abc - du listing: https://gist.github.com/f17e071004c463f800b9a570501643e5 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 7f0fbd71021b..9919fb57f7cc 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180514"; + name = "osinfo-db-20180531"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "1pyz89gwn3s9ha4chgfcfddi6dixm2dp4zsypfd38fwhqa9v0ij2"; + sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From 832973d1791cacedb22f3ee4be87c4c84288f581 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jun 2018 07:17:52 +0000 Subject: [PATCH 61/63] python.pkgs.cairocffi: support darwin --- pkgs/development/python-modules/cairocffi/default.nix | 4 +++- .../python-modules/cairocffi/dlopen-paths.patch | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index a9c4a3437b58..13d00d0529c0 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -1,5 +1,6 @@ # FIXME: make gdk_pixbuf dependency optional -{ buildPythonPackage +{ stdenv +, buildPythonPackage , fetchPypi , lib , substituteAll @@ -42,6 +43,7 @@ buildPythonPackage rec { # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 (substituteAll { src = ./dlopen-paths.patch; + ext = stdenv.hostPlatform.extensions.sharedLibrary; cairo = cairo.out; glib = glib.out; gdk_pixbuf = gdk_pixbuf.out; diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch index bc5e939ceba9..862f7bd4bf7c 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -16,10 +16,10 @@ index 718aa7f..1a1dcff 100644 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime +_LIBS = { -+ 'cairo': '@cairo@/lib/libcairo.so.2', -+ 'glib-2.0': '@glib@/lib/libglib-2.0.so.0', -+ 'gobject-2.0': '@glib@/lib/libgobject-2.0.so.0', -+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0', ++ 'cairo': '@cairo@/lib/libcairo@ext@', ++ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', ++ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', ++ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', +} -def dlopen(ffi, *names): From 0b97cb69f3b62e7cb4a482744ffdf6c17617b733 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 6 Jun 2018 15:53:27 +0800 Subject: [PATCH 62/63] nodePackages_8_x: Add nodejs (npm) to wrapper Some pnpm commands forward to npm which might not exist in $PATH --- pkgs/development/node-packages/default-v8.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index 0428095d97c6..eb87f13f56d3 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -68,9 +68,14 @@ nodePackages // { pnpm = nodePackages.pnpm.override (oldAttrs: { nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; - postInstall = '' + postInstall = let + pnpmLibPath = stdenv.lib.makeBinPath [ + nodejs.passthru.python + nodejs + ]; + in '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ nodejs.passthru.python ]} + wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} done ''; }); From 07ebb8bb792be16de33596e2cea120eb72b2ec77 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jun 2018 07:59:59 +0000 Subject: [PATCH 63/63] tests.cc-wrapper: do not test sanitizers on darwin They are not supported yet. https://github.com/NixOS/nixpkgs/pull/41284#issuecomment-394977350 --- pkgs/test/cc-wrapper/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 00b964940c81..7061adb8e88a 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,8 +1,9 @@ { stdenv }: with stdenv.lib; let + # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersBroken = stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0; + sanitizersBroken = stdenv.isDarwin || stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0; in stdenv.mkDerivation { name = "cc-wrapper-test";