diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 9cf29e5dc57..a699e74e5f6 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -158,7 +158,7 @@ let locatedb = "/var/cache/locatedb"; in script = '' mkdir -m 0755 -p $(dirname ${locatedb}) - exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run' + exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run' ''; }; @@ -172,4 +172,4 @@ let locatedb = "/var/cache/locatedb"; in - \ No newline at end of file + diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 0af85374566..0b7750b0591 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -171,6 +171,13 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + + The phpfpm is now using the default PHP version + (pkgs.php) instead of PHP 5.4 (pkgs.php54). + + + diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a2dbe31e0d8..187ea7635eb 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -70,7 +70,7 @@ my @attrs = (); my @kernelModules = (); my @initrdKernelModules = (); my @modulePackages = (); -my @imports = (""); +my @imports; sub debug { @@ -245,6 +245,18 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") { } +# Pull in NixOS configuration for containers. +if ($virt eq "systemd-nspawn") { + push @attrs, "boot.isContainer = true;"; +} + + +# Provide firmware for devices that are not detected by this script, +# unless we're in a VM/container. +push @imports, "" + if $virt eq "none"; + + # For a device name like /dev/sda1, find a more stable path like # /dev/disk/by-uuid/X or /dev/disk/by-label/Y. sub findStableDevPath { @@ -459,14 +471,14 @@ if ($showHardwareConfig) { if ($force || ! -e $fn) { print STDERR "writing $fn...\n"; - my $bootloaderConfig; + my $bootloaderConfig = ""; if (-e "/sys/firmware/efi/efivars") { $bootLoaderConfig = < http://get.adobe.com/flashplayer/ - version = "11.2.202.481"; + version = "11.2.202.491"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "151di671xqywjif3v4hbsfw55jyd5x5qjq2zc92xw367pssi29yz"; + sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "05ydrw1ykp49b409bkpvizhf1bz1xmfxa7alfdnabvg90vkfvyvn"; + sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/znc/1.4.nix b/pkgs/applications/networking/znc/1.4.nix new file mode 100644 index 00000000000..fdd02aac0b5 --- /dev/null +++ b/pkgs/applications/networking/znc/1.4.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, openssl, pkgconfig +, withPerl ? false, perl +, withPython ? false, python3 +, withTcl ? false, tcl +, withCyrus ? true, cyrus_sasl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "znc-1.4"; + + src = fetchurl { + url = "http://znc.in/releases/${name}.tar.gz"; + sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; + }; + + buildInputs = [ openssl pkgconfig ] + ++ optional withPerl perl + ++ optional withPython python3 + ++ optional withTcl tcl + ++ optional withCyrus cyrus_sasl; + + configureFlags = optionalString withPerl "--enable-perl " + + optionalString withPython "--enable-python " + + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " + + optionalString withCyrus "--enable-cyrus "; + + meta = with stdenv.lib; { + description = "Advanced IRC bouncer"; + homepage = http://wiki.znc.in/ZNC; + maintainers = with maintainers; [ viric ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 1a5b1f92276..36c3b7e899d 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.64"; + name = "gtkwave-3.3.66"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs"; + sha256 = "17mrmgr6zzl1x1qml0wmjjhcbw7bg3w4mqy60rsy0z6gxd8hikh4"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86a98e6f3f4..ccb560fb74d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -241,8 +241,8 @@ self: { }: mkDerivation { pname = "ADPfusion"; - version = "0.4.1.0"; - sha256 = "1x75kb01080hkm00a26vsqy13qgmmsi7xjbcv180v14lh0dm7yjn"; + version = "0.4.1.1"; + sha256 = "06ff9f4wdf7dr0v2cwhzsjn00bmaijgqznhnyf5fp9jyw8ffbbzp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -737,14 +737,13 @@ self: { }: mkDerivation { pname = "AlignmentAlgorithms"; - version = "0.0.1.2"; - sha256 = "1y9c0q34dc2y508sfxgyrgdjg39f4j7h9fjqaykx95dlv383xsjq"; + version = "0.0.2.0"; + sha256 = "110vhp7kdg9l5j3w19wbimmfpq4c05xgx680vb938r1pgpx9s76r"; buildDepends = [ ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; + homepage = "https://github.com/choener/AlignmentAlgorithms"; description = "Collection of alignment algorithms"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -1412,15 +1411,28 @@ self: { }) {}; "BiobaseTypes" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, aeson, base, binary, cereal, cereal-text + , data-default, deepseq, hashable, log-domain, primitive + , PrimitiveArray, QuickCheck, stringable, test-framework + , test-framework-quickcheck2, test-framework-th, text, text-binary + , vector, vector-binary-instances, vector-th-unbox + }: mkDerivation { pname = "BiobaseTypes"; - version = "0.0.2.2"; - sha256 = "03h7a95njbsl67bbg7wfxjjlibsqhkm62f04hhv6s14cgrvh0b3g"; - buildDepends = [ base primitive vector ]; - jailbreak = true; - description = "(deprecated) Ring class, with several instances"; - license = stdenv.lib.licenses.gpl3; + version = "0.1.1.0"; + sha256 = "1z3vhxqqyc1bn1byvld21psi7am8zwmxsa7aiqshppw5hqyslwvl"; + buildDepends = [ + aeson base binary cereal cereal-text data-default deepseq hashable + log-domain primitive PrimitiveArray QuickCheck stringable text + text-binary vector vector-binary-instances vector-th-unbox + ]; + testDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "https://github.com/choener/BiobaseTypes"; + description = "Collection of types for bioinformatics"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -1443,24 +1455,23 @@ self: { "BiobaseXNA" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring - , cereal, cereal-vector, cmdargs, containers, csv, file-embed - , hashable, lens, primitive, PrimitiveArray, split, text, tuple - , vector, vector-binary-instances, vector-th-unbox + , cereal, cereal-vector, cmdargs, containers, csv, deepseq + , file-embed, hashable, lens, primitive, PrimitiveArray, split + , text, tuple, vector, vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.1.1"; - sha256 = "1r9axc6g4fqc3sb47km3pfadx193s68ign8ac4va9wj8a5hilbgq"; + version = "0.9.2.0"; + sha256 = "1ck6yba372w3cbzgifcbfdd2m4nfyy7zd8zygkji3zbxymz2ak18"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bimaps binary bytes bytestring cereal cereal-vector - cmdargs containers csv file-embed hashable lens primitive + cmdargs containers csv deepseq file-embed hashable lens primitive PrimitiveArray split text tuple vector vector-binary-instances vector-th-unbox ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; + homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -4915,8 +4926,8 @@ self: { }: mkDerivation { pname = "FormalGrammars"; - version = "0.2.0.0"; - sha256 = "0qx2r4gvims7s7ki7sanwvyws4ykf7cwxsxpwy3krr2rfqhmhp75"; + version = "0.2.1.0"; + sha256 = "10b7hcwzxnl31wdfdbakcaapihhnwx8lwj0znidvgkk7hyirnx2n"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -4925,8 +4936,7 @@ self: { template-haskell text transformers trifecta unordered-containers vector ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; + homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -4966,8 +4976,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.1.1.1"; - sha256 = "117nqwvxbvcdnma582801im0fp2bg129m0cick43qa7cn9ky1drz"; + version = "0.1.2"; + sha256 = "11444jhck56y2iclgn1daj087qpi99pznk3w82vhbya3pdvrkjac"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -5475,6 +5485,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GenussFold" = callPackage + ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring + , cmdargs, containers, data-default, FormalGrammars, lens, mtl + , PrimitiveArray, QuickCheck, semigroups, template-haskell + , test-framework, test-framework-quickcheck2, test-framework-th + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "GenussFold"; + version = "0.0.0.2"; + sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ADPfusion ansi-wl-pprint base bytestring cmdargs containers + data-default FormalGrammars lens mtl PrimitiveArray semigroups + template-haskell text transformers unordered-containers vector + ]; + testDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "https://github.com/choener/GenussFold"; + description = "MCFGs for Genus-1 RNA Pseudoknots"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "GeoIp" = callPackage ({ mkDerivation, base, bytestring, bytestring-mmap, syb }: mkDerivation { @@ -5690,22 +5727,23 @@ self: { }) {}; "GrammarProducts" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , data-default, FormalGrammars, lens, newtype, parsers, semigroups - , template-haskell, transformers, trifecta + ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring + , containers, data-default, FormalGrammars, lens, newtype, parsers + , PrimitiveArray, semigroups, template-haskell, transformers + , trifecta }: mkDerivation { pname = "GrammarProducts"; - version = "0.1.0.0"; - sha256 = "1is934sdflkhi8idprdihdb7knsi8gi0gd4rdnhn4cd8xjvkicgk"; + version = "0.1.1.0"; + sha256 = "026sjppwk0g10zyw64rds1fifdi7d6p7jzri35cl6hxc33fqdiy3"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-wl-pprint base bytestring containers data-default - FormalGrammars lens newtype parsers semigroups template-haskell - transformers trifecta + ADPfusion ansi-wl-pprint base bytestring containers data-default + FormalGrammars lens newtype parsers PrimitiveArray semigroups + template-haskell transformers trifecta ]; - homepage = "http://www.bioinf.uni-leipzig.de/gADP/"; + homepage = "https://github.com/choener/GrammarProducts"; description = "Grammar products and higher-dimensional grammars"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -15012,13 +15050,16 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers + ({ mkDerivation, base, containers, extra, hashable + , unordered-containers }: mkDerivation { pname = "Unique"; - version = "0.4"; - sha256 = "0la9gxr7kl0s606kl5szb1sw3xwh9pnd1ak6iwlxi7b0bm9syik1"; - buildDepends = [ base containers hashable unordered-containers ]; + version = "0.4.2"; + sha256 = "0riyn68bi6wxz2mhqlywva6a1ngfr4k3gglp12dkhcmllh5l3dc2"; + buildDepends = [ + base containers extra hashable unordered-containers + ]; jailbreak = true; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; @@ -17030,6 +17071,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-operators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-operators"; + version = "0.2.0.0"; + sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w"; + buildDepends = [ base ]; + homepage = "https://github.com/phadej/acme-operators#readme"; + description = "Operators of base, all in one place!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-php" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17712,8 +17765,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.3.0.6"; - sha256 = "0q1ml5q99lwqgppih9zq24nx01z6idcflz30pvl6bljv0xr52wp2"; + version = "0.3.0.7"; + sha256 = "1r84ih3bhnzfl3hl6a4ph4x2l25ls11py3mrxqd04kcpyqzsll5g"; buildDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -18359,12 +18412,12 @@ self: { }) {}; "align" = callPackage - ({ mkDerivation, base, uglymemo, vector }: + ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { pname = "align"; - version = "0.1.1.1"; - sha256 = "1a9a7vmv4sh0aps3cbx2i02i1n9k62pzcahs7swflw0r1b4gzdzv"; - buildDepends = [ base uglymemo vector ]; + version = "0.1.1.2"; + sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9"; + buildDepends = [ base containers transformers vector ]; description = "Sequence alignment algorithms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -24420,17 +24473,14 @@ self: { }: mkDerivation { pname = "bimaps"; - version = "0.0.0.1"; - sha256 = "0d2gfgamfmgwqzhbv45s2irabqcchlymn151yyd0d0sfsvl26vl6"; - isLibrary = true; - isExecutable = true; + version = "0.0.0.2"; + sha256 = "1wipia9lil9r7lhsf9rk82k8ydy5c97qsixg0fia0ms5chmdr7qw"; buildDepends = [ aeson base binary cereal containers deepseq hashable primitive QuickCheck storable-tuple unordered-containers vector vector-binary-instances vector-th-unbox ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; + homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26733,7 +26783,7 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, directory, doctest, doctest-prop, exceptions , filepath, hspec, http-client, http-types, mtl, QuickCheck , quickcheck-properties, semigroups, text, time, transformers @@ -26741,17 +26791,18 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.6.0.1"; - sha256 = "0xnq8iph7dmc3bd2lvbbjdqqgwjynqz7pywh7qkclqn8rz27flfi"; + version = "0.7.0.1"; + sha256 = "1r66nb6vbq1pbh2a97wmsk9iav16ac4ppj5yjv3s5l8qc0rydmjs"; buildDepends = [ - aeson base bytestring containers data-default-class exceptions - http-client http-types mtl semigroups text time transformers - uri-bytestring vector + aeson base blaze-builder bytestring containers data-default-class + exceptions http-client http-types mtl semigroups text time + transformers uri-bytestring vector ]; testDepends = [ - aeson base containers directory doctest doctest-prop filepath hspec - http-client http-types mtl QuickCheck quickcheck-properties - semigroups text time unordered-containers vector + aeson base bytestring containers directory doctest doctest-prop + filepath hspec http-client http-types mtl QuickCheck + quickcheck-properties semigroups text time unordered-containers + vector ]; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; @@ -30119,10 +30170,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.3.0"; - revision = "1"; - sha256 = "0pwcxv1mdn0p6hw2w5fiw4w75mnxphngzj62jw3nbd80bswdp2x3"; - editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7"; + version = "0.4.3.1"; + sha256 = "1b62zx6fna0nx3qvs316bwc39l8qan9fpm82f1p28ipkyq0ym2g3"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -32845,8 +32894,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.4"; - sha256 = "0cmrh524s2in66vb51hzfrbxq7z8afh243c8x1378s9hxk0r6xya"; + version = "0.4.0.1"; + sha256 = "1kimba33r0f2ify0sxy7x9npqarb9xaw8hih1z6vvf1bkjsji0v3"; buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -34820,8 +34869,8 @@ self: { }: mkDerivation { pname = "configifier"; - version = "0.0.4"; - sha256 = "0wd32v9a0jmz9v732z2ph8spb2kh89zj48350kvvappfbqdfh09a"; + version = "0.0.5"; + sha256 = "0k3r8i2mb06kvrqfln0birwd92bwx8m55wpahnbbzs35i35p60vz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -35156,6 +35205,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "consumers" = callPackage + ({ mkDerivation, base, containers, exceptions, hpqtypes + , lifted-base, lifted-threads, log, monad-control, mtl, stm, time + , transformers-base + }: + mkDerivation { + pname = "consumers"; + version = "0.1"; + sha256 = "0y977lhxcaxjw6c760fifmisxn62lji0qs8aqgyag6jmzmkfymdb"; + buildDepends = [ + base containers exceptions hpqtypes lifted-base lifted-threads log + monad-control mtl stm time transformers-base + ]; + homepage = "https://github.com/scrive/consumers"; + description = "Concurrent PostgreSQL data consumers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "container-classes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41424,8 +41491,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.7.0.4"; - sha256 = "1nxb6fpcjkcwyihhd0dj9zs72flhhg4g9g7r2xlbdi5l7j3kpkjg"; + version = "0.7.1"; + sha256 = "1cfmklds0l2jyn7p2hldq0riq4m01dxfg9cran6sx65a7d82x96d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42056,8 +42123,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.15"; - sha256 = "19zjn3cykxyrk0dblmrvbrmggnsxigfxvhjnjmrq60z1iljvrqrr"; + version = "1.1.16"; + sha256 = "0v01applw92imi3yr6drd1bqig1l1mlps1ia2i1dcln1sh31ms9y"; buildDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -42066,7 +42133,6 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; - jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; @@ -46208,8 +46274,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.9"; - sha256 = "0ral95ywkni205gmn2q58fpibaf4a1y5dxawkc5rq5j0wnmh465j"; + version = "1.2.10"; + sha256 = "02wc4fdwrnaw934bxk39bfndzn2rjdcaa3rifcj84ap750fx16h0"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -47014,8 +47080,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.2.7"; - sha256 = "1i5gm1riirz8wq2zr2a2fxlnxa7c5rrvywyigbx2gla9xi07dzs6"; + version = "2.2.10"; + sha256 = "0chxxcy52xrhdq7pgwzq3vk9filrrc3mdnx6j26r2ih56j1ac02l"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -51256,8 +51322,8 @@ self: { }: mkDerivation { pname = "free-http"; - version = "0.1.1.1"; - sha256 = "1gifjrz7bmrcyv6pc6gl55vw0vmnzjzjhvslwvj8p8c8xbv2fxrh"; + version = "0.1.1.3"; + sha256 = "1gmafmi0mrmbm7a08cxiz96s43k4sc38wvzrnmcrqcl44a1n38fm"; buildDepends = [ base bytestring free http-client http-types mtl QuickCheck text time transformers @@ -51569,8 +51635,8 @@ self: { ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "frpnow"; - version = "0.11"; - sha256 = "0lvlgn1bv9flhs9x3i5zf1zd6l7nd4i3asscc0nmqmpnidcmlkcn"; + version = "0.13"; + sha256 = "13dvyf1zwzvcpal7zp1jx5ns49a01jsjn3pz0iqdrph7qgll2aqr"; buildDepends = [ base containers mtl transformers ]; homepage = "https://github.com/atzeus/FRPNow"; description = "Principled practical FRP"; @@ -53177,8 +53243,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.7.1.1"; - sha256 = "1zhglg3h6a6sx3chq9h6j2r279f2753j026mz8kb9v4lajj5vcn0"; + version = "0.8"; + sha256 = "0qxdr9y3dvr4w7hhbgkianaijsqfh36gfwh1blhbr1nf7cv9khmd"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -62790,18 +62856,18 @@ self: { "hat" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , haskeline, haskell-src-exts, old-locale, old-time, process - , random + , haskeline, haskell-src-exts, old-locale, old-time, polyparse + , process, random }: mkDerivation { pname = "hat"; - version = "2.8.0.0"; - sha256 = "06qb34g2kxsldkgpw02xs7cknhj6igfwgjxi2fxyr2856y8laj0j"; + version = "2.9.0.0"; + sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring containers directory filepath haskeline - haskell-src-exts old-locale old-time process random + haskell-src-exts old-locale old-time polyparse process random ]; homepage = "http://projects.haskell.org/hat/"; description = "The Haskell tracer, generating and viewing Haskell execution traces"; @@ -63040,8 +63106,8 @@ self: { }) {}; "hayland" = callPackage - ({ mkDerivation, base, data-flags, process, template-haskell, time - , wayland-client, wayland-cursor, wayland-egl, wayland-server, xml + ({ mkDerivation, base, data-flags, mesa, process, template-haskell + , time, wayland, xml }: mkDerivation { pname = "hayland"; @@ -63053,15 +63119,12 @@ self: { base data-flags process template-haskell time xml ]; testDepends = [ base process xml ]; - extraLibraries = [ - wayland-client wayland-cursor wayland-egl wayland-server - ]; + extraLibraries = [ mesa wayland ]; jailbreak = true; description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { wayland-client = null; wayland-cursor = null; - wayland-egl = null; wayland-server = null;}; + }) { inherit (pkgs) mesa; inherit (pkgs) wayland;}; "hayoo-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types @@ -68399,8 +68462,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.5.2"; - sha256 = "12671fsydxxkdpk47nmzm9qc5vlss6802bypx690z8c982s4vbr1"; + version = "0.5.4"; + sha256 = "1ghj80w5hx736hkr9z827s4f2fli5r4y0q3ka9ay706k5lj0g9xa"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73566,8 +73629,8 @@ self: { }: mkDerivation { pname = "hwsl2"; - version = "0.3.0.1"; - sha256 = "1zs1wlnvh316n914mrlihrd4njbnq9n070ckq5f7hbax37v3h9p5"; + version = "0.3.2.0"; + sha256 = "0y3k9xlhzvscbwzrhxgiqf9s3724zak1nbnf6lcaynpzk4p8jmm1"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck QuickCheck @@ -73579,6 +73642,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hwsl2-bytevector" = callPackage + ({ mkDerivation, base, bytestring, fingertree, hwsl2 }: + mkDerivation { + pname = "hwsl2-bytevector"; + version = "0.1.0.0"; + sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9"; + buildDepends = [ base bytestring fingertree hwsl2 ]; + homepage = "https://github.com/srijs/hwsl2-haskell-bytevector"; + description = "A hashed byte-vector based on algebraic hashes and finger trees"; + license = stdenv.lib.licenses.mit; + }) {}; + "hwsl2-reducers" = callPackage ({ mkDerivation, base, bytestring, hwsl2, reducers, semigroups }: mkDerivation { @@ -76068,12 +76143,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "instant-aeson" = callPackage + ({ mkDerivation, aeson, base, instant-generics, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "instant-aeson"; + version = "0.1"; + sha256 = "1idxwd0wxy6xziwlwnjwgbv9canpvwbnigrcjn3kvl0j7nld6wvj"; + buildDepends = [ aeson base instant-generics ]; + testDepends = [ + aeson base instant-generics tasty tasty-quickcheck + ]; + jailbreak = true; + description = "Generic Aeson instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "instant-bytes" = callPackage + ({ mkDerivation, base, bytes, instant-generics, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "instant-bytes"; + version = "0.1"; + sha256 = "0gjj7ix1dxlbk1im2ww3qpfx4m40vg0hl7n9ribnlx2krw53mmm1"; + buildDepends = [ base bytes instant-generics ]; + testDepends = [ + base bytes instant-generics tasty tasty-quickcheck + ]; + jailbreak = true; + description = "Generic Serial instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "instant-deepseq" = callPackage + ({ mkDerivation, base, deepseq, instant-generics }: + mkDerivation { + pname = "instant-deepseq"; + version = "0.1"; + sha256 = "13w4ilnjm6m9idqkxzp0l91f156n097zlhmpny1lamy5brvzpls0"; + buildDepends = [ base deepseq instant-generics ]; + jailbreak = true; + description = "Generic NFData instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "instant-generics" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "instant-generics"; - version = "0.4.1"; - sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq"; + version = "0.5"; + sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr"; buildDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -76081,6 +76202,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "instant-hashable" = callPackage + ({ mkDerivation, base, hashable, instant-generics }: + mkDerivation { + pname = "instant-hashable"; + version = "0.1"; + sha256 = "0bqn9na0pxkkffmwwz6p4rgv11fq2mn724sk4l7nxv44k7vrirz2"; + buildDepends = [ base hashable instant-generics ]; + jailbreak = true; + description = "Generic Hashable instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "instant-zipper" = callPackage ({ mkDerivation, base, instant-generics, mtl }: mkDerivation { @@ -78374,12 +78507,11 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.6"; - sha256 = "00bjmbx4rbbijdhcpbnbjilfm030ml2lpvsf4c89vx1fyzin1nrj"; + version = "1.0.7"; + sha256 = "1x73szyqb6w1hnhb4ab8dfc7hwn12avj4304jnr8lyxjg08hfaqa"; buildDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; - jailbreak = true; homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; @@ -82158,8 +82290,10 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.12"; - sha256 = "195fhzw8z15zrbav7mdzia052g7sfy7zm5banjkk3azsb9mjvvan"; + version = "4.12.1"; + revision = "1"; + sha256 = "0rzi0z5vz78v99f1hk8izixhxf3linz3xjkancg8x65g03brwl33"; + editedCabalFile = "fedce7a783a5a622bb19e00145e775ff8ea7d797f71fd22c9eb2257672b7f741"; buildDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -82207,9 +82341,9 @@ self: { mkDerivation { pname = "lens-aeson"; version = "1.0.0.4"; - revision = "1"; + revision = "2"; sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v"; - editedCabalFile = "252661ca9f157ea5cb0aa6684c50fa1b84a2a3ed300c2eaec9ffb82eb18e7ddd"; + editedCabalFile = "f9ddeac68a237cb5dbe8ab7457fb7529bdeeb675c5e80bc122e196255072393d"; buildDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -83524,8 +83658,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.19.1.2"; - sha256 = "1bxzy4735xc0zdxmwrspmjcn4p61kjwzxi8agjfx7w1dsyah2if3"; + version = "1.19.1.3"; + sha256 = "1hprmhs1nm6l81kpnnznz92l66j10z4asn3g3l9c47165q881592"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -83536,7 +83670,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -86823,8 +86956,8 @@ self: { }: mkDerivation { pname = "mangopay"; - version = "1.11.2"; - sha256 = "06f1gj877cnhjp5dh4gxza9vr6x3l2c3ppschdhkyj1ly65q3z5q"; + version = "1.11.3"; + sha256 = "1w9p0na0am2hl8f32qgkdym00kjjnavv1wxp6f4vh9msa6cfw6yl"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -87341,10 +87474,8 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.4.3"; - revision = "1"; - sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; - editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace"; + version = "0.3.4.4"; + sha256 = "03aaw60x8849rsrcqc8n0d3k8a6dp8naxnqfq2xq776q5zbbcrpv"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -89779,12 +89910,9 @@ self: { ({ mkDerivation, base, extensible-exceptions, transformers }: mkDerivation { pname = "monad-peel"; - version = "0.1.1"; - revision = "1"; - sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l"; - editedCabalFile = "64e1f99ea3e8c36d5d4e86794d1fc02966e7036b43ae4e1dcf01ade192962611"; + version = "0.2"; + sha256 = "1cg6j2qhh14ryn4766dwx57g50qalzcv79rx9ysdgkskkjs6fiix"; buildDepends = [ base extensible-exceptions transformers ]; - jailbreak = true; homepage = "http://andersk.mit.edu/haskell/monad-peel/"; description = "Lift control operations like exception catching through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -90444,8 +90572,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.1"; - sha256 = "0wgy0cqi2x12xn1sbxwfbwzj6bii2b6rhf8gi4q2jja5nh04a4vz"; + version = "0.4.1.1"; + sha256 = "0r2ypb85qz88jz70pr4rgygwsdslaw781s0d3svd6s7xfibi9hww"; buildDepends = [ base bytestring containers primes text vector ]; testDepends = [ base bytestring containers primes QuickCheck quickcheck-instances @@ -97325,8 +97453,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.15.0.5"; - sha256 = "0js3k6kvq506yssx5d4wwx9hsd0pm81k8g0rpd7wi2aixibs2jj2"; + version = "1.15.0.6"; + sha256 = "0ipdy5wl2qb8nvmdka9si17hvxn38xmv5pzpb9v5lvaj8a0rcl6r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97455,14 +97583,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.4"; - sha256 = "0qk62cn8j3ml0fc12ikfw0pp2b6gqlfn96n5jv9dvyajxqxrby5g"; + version = "1.12.4.5"; + sha256 = "0yw7mkhx63320vqabql2iqnmkrwh1qs670sicqpcvv73dchdp8c7"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -100223,8 +100351,8 @@ self: { }: mkDerivation { pname = "pipes-cliff"; - version = "0.10.0.2"; - sha256 = "1j912dshjf2pdj87rlib4nqd00i99hz74cxhrf2ddlaabml9fs98"; + version = "0.10.0.4"; + sha256 = "0czgzmfl5rs0p63x24zr4pcl01a0wy93hx8wpin9k61yfx7bb4ix"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102292,6 +102420,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) adns; inherit (pkgs) openssl;}; + "potato-tool" = callPackage + ({ mkDerivation, base, binary, bytestring, split }: + mkDerivation { + pname = "potato-tool"; + version = "0.1.0.1"; + sha256 = "02y6syz54vc4brbpy4760xd2jlwbfqghn7k2ccy4kxz4xzhm9cdw"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base binary bytestring split ]; + homepage = "https://github.com/RossMeikleham/Potato_Tool"; + description = "Command line Dreamcast VMU filesystem toolset"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -103995,8 +104137,8 @@ self: { }: mkDerivation { pname = "pseudo-boolean"; - version = "0.1.1.0"; - sha256 = "0j80pwmp8jpkmh0k76v9mqa3xcbdhb0r4sgq1nkfdf4gm5mn7v03"; + version = "0.1.2.0"; + sha256 = "13bgv7kkglajrvng7vcy7qv9x8xlm0nrv8in8zh5w5m6xl7i5wkz"; buildDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable parsec @@ -105555,11 +105697,10 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.26.0.4"; - sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4"; + version = "0.26.0.6"; + sha256 = "1v0za967cp1205fkbwglf28yn2pslp7dvyqb3rbym3j7r3pby3zc"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; - jailbreak = true; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -105582,16 +105723,16 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck, rainbow - , tasty, tasty-quickcheck, text + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text }: mkDerivation { pname = "rainbox"; - version = "0.16.0.0"; - sha256 = "0aihr386m1n5p0d4iym5rvg74ihdm180sm6b4mqmiihhl00lr1p2"; - buildDepends = [ base bytestring containers rainbow text ]; + version = "0.18.0.2"; + sha256 = "1dczbs4y8yzvp132cfy0fl1jv2zf2nm6d3zn4j4pmy2p8cxs1g4v"; + buildDepends = [ base bytestring containers lens rainbow text ]; testDepends = [ - base bytestring containers QuickCheck rainbow tasty + base bytestring containers lens QuickCheck rainbow tasty tasty-quickcheck text ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -108317,6 +108458,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "repa-linear-algebra" = callPackage + ({ mkDerivation, base, hmatrix, repa, vector }: + mkDerivation { + pname = "repa-linear-algebra"; + version = "0.0.0.0"; + sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1"; + buildDepends = [ base hmatrix repa vector ]; + homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; + description = "HMatrix operations for Repa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-plugin" = callPackage ({ mkDerivation, base, containers, ddc-base, ddc-core , ddc-core-flow, ddc-core-simpl, ghc, mtl @@ -114434,6 +114587,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shortcut-links" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "shortcut-links"; + version = "0.3.0.0"; + sha256 = "14g1s2gb1jc52zifn00n1w35qckv7p620rqhpn7rfhymlz6b07rz"; + buildDepends = [ base text ]; + homepage = "http://github.com/aelve/shortcut-links"; + description = "Link shortcuts for use in text markup"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shorten-strings" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -116117,12 +116282,12 @@ self: { }) {}; "smoothie" = callPackage - ({ mkDerivation, aeson, base, linear, vector }: + ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.3.3.2"; - sha256 = "0jkcy45rxq14ma11h4dakv8ixwzynlml02yd3nmncmlm8vzpah8n"; - buildDepends = [ aeson base linear vector ]; + version = "0.4"; + sha256 = "0j8nwc44q9l7wf4m3z7r32b7if7is21k3xgmi2206r4i1yxc869j"; + buildDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; @@ -117573,8 +117738,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.2.5"; - sha256 = "1imh9g2my0d981prai69yr9yf7linvaijcn80zlyaz44pasxnrw7"; + version = "0.2.2.7"; + sha256 = "02yirl0pr680pbwbh9z0awyk4blgdd0rir8x1gyydyn6v5dg736i"; buildDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -117689,8 +117854,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.2"; - sha256 = "0bqrglnp54hd777lq92ia7z9vwmj1dq24m7lbiqhzvvb63p9mv4i"; + version = "1.3.3"; + sha256 = "1gy8g8bxjjj1hifkhvid6v8amml0gpp6gbfpih3v0grbi5aci0w7"; buildDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -121098,10 +121263,10 @@ self: { mkDerivation { pname = "stripe-haskell"; version = "0.1.4.1"; - sha256 = "a0ffc70616d4eb86a9e0e0fcb1751cc48f3b6f618d07cf2bb96090276d64d218"; + sha256 = "066jcinjg430p4mwy1wdc5pkp3y43isv3z70w2lqdsyl2q3cgzx0"; buildDepends = [ - aeson base bytestring either HsOpenSSL http-streams io-streams mtl - random text time transformers unordered-containers + aeson base bytestring either HsOpenSSL hspec http-streams + io-streams mtl random text time transformers unordered-containers ]; testDepends = [ aeson base bytestring either HsOpenSSL hspec http-streams random @@ -125311,8 +125476,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.1"; - sha256 = "15nb4izk4j0hg2hhynrjd5vjnpg240rlcp489w4hm4b4nmpdd4cj"; + version = "0.0.2"; + sha256 = "0xkp0kw4xm8ppkhzplcx79cx9d5slk8qb8amcjiiy71ihj87b0vi"; buildDepends = [ base binary lens semigroups text ]; testDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -125678,8 +125843,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.12.1"; - sha256 = "11vndilqcx9scbb988xzpaj823g65a7b7vx6jzf9r3nb808kyb2j"; + version = "0.12.2"; + sha256 = "0435l20vzsr6p4app6riyf242hcqizbypf4f5v17wjy3ihw0jddb"; buildDepends = [ base mtl nats template-haskell th-lift th-reify-many ]; @@ -125738,18 +125903,18 @@ self: { }) {}; "th-typegraph" = callPackage - ({ mkDerivation, array, base, bytestring, containers, data-default - , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl - , syb, template-haskell, text, th-desugar, th-orphans - , th-reify-many + ({ mkDerivation, array, base, base-compat, bytestring, containers + , data-default, deepseq, ghc-prim, haskell-src-exts, hspec + , hspec-core, lens, mtl, set-extra, syb, template-haskell, text + , th-desugar, th-orphans, th-reify-many }: mkDerivation { pname = "th-typegraph"; - version = "0.18"; - sha256 = "0z47q4sj5z3ajv17d4rda8zaqbbay36x1z6vy8i5c1g6971y8vs5"; + version = "0.21"; + sha256 = "1w4k466snhkcdg30kzzc2vwiz2p46ybks1bbyf3nazc322zxryq0"; buildDepends = [ - base containers data-default haskell-src-exts lens mtl syb - template-haskell th-desugar th-orphans + base base-compat containers data-default haskell-src-exts lens mtl + set-extra syb template-haskell th-desugar th-orphans ]; testDepends = [ array base bytestring containers data-default deepseq ghc-prim @@ -139873,13 +140038,12 @@ self: { }: mkDerivation { pname = "yesod-sass"; - version = "0.1.1.0"; - sha256 = "19l93rx70xbyllwddyq0c8326cfqyvx13hpvj71k9mbwkis16ccx"; + version = "0.1.2.0"; + sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94"; buildDepends = [ base data-default hsass shakespeare template-haskell text yesod-core ]; - jailbreak = true; description = "A simple quasiquoter to include sass code in yesod"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140097,8 +140261,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.2.0.0"; - sha256 = "0zr36i9bpf2x8jav31gb2gc3i8hyfn7k1yizvbk2zcjcp9iiphhw"; + version = "0.2.1.0"; + sha256 = "1x4sbjzlx5kxwcsywb90milk5s7shgggsqjsq7zrys28w079y00k"; buildDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers yesod yesod-core @@ -140829,6 +140993,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zero" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "zero"; + version = "0.1.1"; + sha256 = "1ksmhp7lvgapi9mp3q5i5prxgrxsamnvv0883nbw09vfpvg9ms2l"; + buildDepends = [ base semigroups ]; + homepage = "https://github.com/phaazon/zero"; + description = "Semigroups with absorption"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeromq-haskell" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , test-framework, test-framework-quickcheck2, zeromq diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 9f9e8dbe374..2d4438b5759 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "socat-2.0.0-b7"; + name = "socat-2.0.0-b8"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0h6k9ccrnziw03j0if7myrd28vcc97nwz1bifmbrkp5jkpk69ygk"; + sha256 = "1slkv1hhcp9a6c88h6yl5cs0z9g60fp2ja6865s6kywqp6fmf168"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index bfa1a0ab9f4..525259bdb02 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }: +{ stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }: stdenv.mkDerivation rec { - name = "tor-0.2.6.9"; + name = "tor-0.2.6.10"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a"; + sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d"; }; # Note: torsocks is specified as a dependency, as the distributed # 'torify' wrapper attempts to use it; although there is no # ./configure time check for any of this. - buildInputs = [ libevent openssl zlib torsocks ]; + buildInputs = [ libevent openssl zlib torsocks libseccomp ]; - CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; # Patch 'torify' to point directly to torsocks. patchPhase = '' diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 7e0a165ae89..fe8809e8263 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,7 +1,7 @@ args : with args; rec { - src = assert !config.inHydra or false; fetchurl { + src = assert config.allowTexliveBuilds or false; fetchurl { url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz; sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9e56116ff..aaef9248d3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15044,6 +15044,8 @@ let znc = callPackage ../applications/networking/znc { }; + znc_14 = callPackage ../applications/networking/znc/1.4.nix { }; + zncModules = recurseIntoAttrs ( callPackage ../applications/networking/znc/modules.nix { } ); diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 8c66964ba72..15380ea43c8 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,4 +1,4 @@ -{ supportedSystems, packageSet ? (import ./all-packages.nix) }: +{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }: with import ../../lib; @@ -7,6 +7,7 @@ rec { # Ensure that we don't build packages marked as unfree. allPackages = args: packageSet (args // { config.allowUnfree = false; + config.allowTexliveBuilds = allowTexliveBuilds; config.inHydra = true; });