about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/science/machine-learning/sc2-headless/default.nix5
-rw-r--r--pkgs/applications/science/machine-learning/sc2-headless/maps.nix31
-rw-r--r--pkgs/applications/science/math/gmsh/default.nix4
-rw-r--r--pkgs/data/misc/hackage/default.nix4
-rw-r--r--pkgs/development/compilers/ghcjs-ng/default.nix1
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix3
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix4
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix234
-rw-r--r--pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch82
-rw-r--r--pkgs/development/mobile/cocoapods/Gemfile.lock34
-rw-r--r--pkgs/development/mobile/cocoapods/gemset.nix54
-rwxr-xr-xpkgs/development/mobile/cocoapods/update13
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix4
13 files changed, 370 insertions, 103 deletions
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index ced075ff432e..c0536b36cfe3 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -33,8 +33,9 @@ in stdenv.mkDerivation rec {
     cp -r . "$out"
     rm -r $out/Libs
 
-    cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
-      "${maps.ladder2017season4}"/*  "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/
+    cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
+      "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \
+      "${maps.ladder2018season3}"/*  "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/
   '';
 
   preFixup = ''
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
index 228bafe3f7c5..c71099ad6a71 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
@@ -1,7 +1,7 @@
-{ fetchzip
+{ fetchzip, unzip
 }:
 let
-  fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; });
+  fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; });
 in
 {
   minigames = fetchzip {
@@ -17,32 +17,47 @@ in
   };
   ladder2017season1 = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip";
-    sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh";
+    sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd";
     stripRoot = false;
   };
   ladder2017season2 = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip";
-    sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39";
+    sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5";
     stripRoot = false;
   };
   ladder2017season3 = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip";
-    sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a";
+    sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld";
     stripRoot = false;
   };
   ladder2017season4 = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip";
-    sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g";
+    sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp";
     stripRoot = false;
   };
   ladder2018season1 = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip";
-    sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f";
+    sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq";
     stripRoot = false;
   };
   ladder2018season2 = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip";
-    sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx";
+    sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv";
+    stripRoot = false;
+  };
+  ladder2018season3 = fetchzip' {
+    url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip";
+    sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp";
+    stripRoot = false;
+  };
+  ladder2018season4 = fetchzip' {
+    url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip";
+    sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s";
+    stripRoot = false;
+  };
+  ladder2019season1 = fetchzip' {
+    url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip";
+    sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9";
     stripRoot = false;
   };
 }
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 694c621db00b..76e5071908f1 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "4.1.3"; in
+let version = "4.1.5"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx";
+    sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46";
   };
 
   buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index c50c511e7363..b167069cd893 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/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz";
-  sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f59e85c25b8e9f07459338884e25d16752839b54.tar.gz";
+  sha256 = "0yapmana2kzsixmgghj76w3s546d258rbzw7qmfqhi6bxyhc6a86";
 }
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 14a210783896..7e8c3c7dcf05 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -105,4 +105,5 @@ in stdenv.mkDerivation {
 
     meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
     meta.maintainers = [lib.maintainers.elvishjerricco];
+    meta.broken = true;
   }
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 0502e7003133..5a562f78af0c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -487,6 +487,9 @@ self: super: builtins.intersectAttrs super {
   # https://github.com/plow-technologies/servant-streaming/issues/12
   servant-streaming-server = dontCheck super.servant-streaming-server;
 
+  # https://github.com/haskell-servant/servant/pull/1128
+  servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch;
+
   # tests run executable, relying on PATH
   # without this, tests fail with "Couldn't launch intero process"
   intero = overrideCabal super.intero (drv: {
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 2724ff5d6220..e8195668c41c 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -19,6 +19,7 @@ in
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
 , buildFlags ? []
+, haddockFlags ? []
 , description ? ""
 , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
 , doBenchmark ? false
@@ -372,7 +373,8 @@ stdenv.mkDerivation ({
     ${optionalString (doHaddock && isLibrary) ''
       ${setupCommand} haddock --html \
         ${optionalString doHoogle "--hoogle"} \
-        ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"}
+        ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
+        ${stdenv.lib.concatStringsSep " " haddockFlags}
     ''}
     runHook postHaddock
   '';
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3113d433bac4..189c65d58389 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28729,8 +28729,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbor-monad-metric";
-       version = "1.1.1";
-       sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h";
+       version = "1.2.0";
+       sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf";
        libraryHaskellDepends = [
          base containers generic-lens lens mtl resourcet stm text
          transformers
@@ -29818,7 +29818,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "asif_4_0_0" = callPackage
+  "asif_4_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
      , conduit-combinators, conduit-extra, containers, cpu, directory
      , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits
@@ -29828,8 +29828,8 @@ self: {
      }:
      mkDerivation {
        pname = "asif";
-       version = "4.0.0";
-       sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6";
+       version = "4.0.1";
+       sha256 = "172vqpdv9jjqj8vzq2v2pfvkmjpkhlpl03mafqk5cvdj72a7vy3s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60432,8 +60432,8 @@ self: {
      }:
      mkDerivation {
        pname = "datadog-tracing";
-       version = "1.0.1";
-       sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq";
+       version = "1.1.0";
+       sha256 = "1zrdbgljm35r8nqw0lg4pq1ywcv76ifplgdh860zq9sjdz5f5lxi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61738,10 +61738,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
        pname = "decimal-literals";
-       version = "0.1.0.0";
-       sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7";
-       revision = "3";
-       editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb";
+       version = "0.1.0.1";
+       sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
@@ -84030,6 +84028,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity_0_7_0_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+     mkDerivation {
+       pname = "genvalidity";
+       version = "0.7.0.1";
+       sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz";
+       libraryHaskellDepends = [ base QuickCheck validity ];
+       testHaskellDepends = [ base hspec hspec-core QuickCheck ];
+       description = "Testing utilities for the validity library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-aeson" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
@@ -97487,26 +97498,28 @@ self: {
 
   "halive" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear
-     , mtl, process, random, sdl2, signal, stm, text, time, transformers
+     , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec
+     , lens, linear, mtl, pretty-show, process, random, sdl2, signal
+     , stm, text, time, transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.3";
-       sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378";
+       version = "0.1.6";
+       sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers directory filepath foreign-store fsnotify ghc
-         ghc-boot ghc-paths mtl process signal stm time transformers
+         ghc-boot ghc-paths mtl process signal stm text time transformers
        ];
        executableHaskellDepends = [
          base directory filepath fsnotify ghc ghc-paths process stm
          transformers
        ];
        testHaskellDepends = [
-         base bytestring containers filepath foreign-store gl linear mtl
-         random sdl2 stm text time
+         base bytestring containers directory filepath foreign-store ghc
+         ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text
+         time
        ];
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
@@ -102619,8 +102632,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.10.1";
-       sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2";
+       version = "0.11.0";
+       sha256 = "03rhbp4rc4ycmnj5gsa79pjzgmp659xwbajaqfns4xgb3d0nhylx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118413,8 +118426,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit-downloader";
-       version = "1.0.31";
-       sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c";
+       version = "1.0.33";
+       sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3";
        libraryHaskellDepends = [
          base bytestring conduit connection data-default HsOpenSSL
          http-client http-conduit http-types mtl network network-uri
@@ -133832,6 +133845,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-puppet_1_4_3" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, filecache, filepath, formatting, Glob
+     , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
+     , http-client, lens, lens-aeson, megaparsec, memory, mtl
+     , operational, optparse-applicative, parsec, parser-combinators
+     , pcre-utils, protolude, random, regex-pcre-builtin, scientific
+     , servant, servant-client, split, stm, strict-base-types, temporary
+     , text, time, transformers, unix, unordered-containers, vector
+     , yaml
+     }:
+     mkDerivation {
+       pname = "language-puppet";
+       version = "1.4.3";
+       sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory filecache filepath
+         formatting hashable hruby hslogger http-api-data http-client lens
+         lens-aeson megaparsec memory mtl operational parsec
+         parser-combinators pcre-utils protolude random regex-pcre-builtin
+         scientific servant servant-client split stm strict-base-types text
+         time transformers unix unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint async base bytestring containers Glob hslogger
+         http-client lens mtl optparse-applicative regex-pcre-builtin
+         strict-base-types text transformers unordered-containers vector
+         yaml
+       ];
+       testHaskellDepends = [
+         base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
+         pcre-utils scientific strict-base-types temporary text transformers
+         unordered-containers vector
+       ];
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -137352,6 +137409,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "line-bot-sdk" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , cryptohash-sha256, errors, hspec, hspec-wai, hspec-wai-json
+     , http-client, http-client-tls, http-types, scientific, servant
+     , servant-client, servant-client-core, servant-server
+     , string-conversions, text, time, transformers, wai, wai-extra
+     , warp
+     }:
+     mkDerivation {
+       pname = "line-bot-sdk";
+       version = "0.1.0.0";
+       sha256 = "0kcnxldqks6nvifzsdlkrkfypmj2yzavs675bw96x721mxb63czp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptohash-sha256 errors
+         http-client http-client-tls http-types scientific servant
+         servant-client servant-client-core servant-server
+         string-conversions text time transformers wai wai-extra
+       ];
+       executableHaskellDepends = [
+         base servant servant-client servant-server time transformers wai
+         wai-extra warp
+       ];
+       testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json ];
+       description = "Haskell SDK for LINE Messaging API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "line-break" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -166728,15 +166814,16 @@ self: {
      }:
      mkDerivation {
        pname = "pinch";
-       version = "0.3.4.0";
-       sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a";
+       version = "0.3.4.1";
+       sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk";
        libraryHaskellDepends = [
          array base bytestring containers deepseq ghc-prim hashable
          semigroups text unordered-containers vector
        ];
+       libraryToolDepends = [ hspec-discover ];
        testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck
-         semigroups text unordered-containers vector
+         base bytestring containers hspec QuickCheck semigroups text
+         unordered-containers vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
@@ -174243,6 +174330,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-radius-test_0_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers
+     , protocol-radius, QuickCheck, quickcheck-simple, transformers
+     }:
+     mkDerivation {
+       pname = "protocol-radius-test";
+       version = "0.1.0.0";
+       sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88";
+       libraryHaskellDepends = [
+         base bytestring cereal containers protocol-radius QuickCheck
+         quickcheck-simple transformers
+       ];
+       testHaskellDepends = [ base quickcheck-simple ];
+       description = "testsuit of protocol-radius haskell package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protolude" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
@@ -174338,6 +174443,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proxied_0_3_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "proxied";
+       version = "0.3.1";
+       sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r";
+       libraryHaskellDepends = [ base ];
+       description = "Make functions consume Proxy instead of undefined";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proxy" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -178682,7 +178799,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_6_2_2" = callPackage
+  "rattletrap_6_2_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
      , bytestring, clock, containers, filepath, http-client
      , http-client-tls, HUnit, template-haskell, temporary, text
@@ -178690,8 +178807,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "6.2.2";
-       sha256 = "06gbvkg6wn7dql954bzbw8l1460hk2f9055404q0a949qlmmqb3p";
+       version = "6.2.3";
+       sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195484,8 +195601,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative }:
      mkDerivation {
        pname = "simple-cmd-args";
-       version = "0.1.0";
-       sha256 = "1cwh2ikk1iccbm5yq7hihk3yhfg4zbxsi8q1jpjavzlcs18sfnll";
+       version = "0.1.0.1";
+       sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d";
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Simple command args parsing and execution";
        license = stdenv.lib.licenses.bsd3;
@@ -214479,6 +214596,8 @@ self: {
        pname = "these-skinny";
        version = "0.7.4";
        sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
+       revision = "1";
+       editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c";
        libraryHaskellDepends = [ base deepseq ];
        description = "A fork of the 'these' package without the dependency bloat";
        license = stdenv.lib.licenses.bsd3;
@@ -224697,8 +224816,8 @@ self: {
      }:
      mkDerivation {
        pname = "uuagc";
-       version = "0.9.52.1";
-       sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq";
+       version = "0.9.52.2";
+       sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -225269,6 +225388,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity_0_9_0_1" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "validity";
+       version = "0.9.0.1";
+       sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "Validity typeclass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-aeson" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
@@ -226901,6 +227033,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vinyl-named-sugar" = callPackage
+    ({ mkDerivation, base, vinyl }:
+     mkDerivation {
+       pname = "vinyl-named-sugar";
+       version = "0.1.0.0";
+       sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h";
+       libraryHaskellDepends = [ base vinyl ];
+       description = "Syntax sugar for vinyl records using overloaded labels";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vinyl-operational" = callPackage
     ({ mkDerivation, base, operational, operational-extra, vinyl-plus
      }:
@@ -227489,28 +227632,29 @@ self: {
      , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json
      , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers
      , scientific, semigroupoids, semigroups, tagged, tasty
-     , tasty-expected-failure, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, transformers, vector, witherable
-     , wl-pprint-annotated, zippers
+     , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit
+     , template-haskell, text, transformers, unordered-containers
+     , vector, witherable, wl-pprint-annotated, zippers
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.5.2.2";
-       sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95";
+       version = "0.6.0.0";
+       sha256 = "1nbykbgx9qzwzcilg2kmrr51fggczynn6kv7a60vsxxckkqlgy8j";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base bifunctors bytestring containers contravariant digit
-         distributive errors generics-sop hoist-error hw-balancedparens
-         hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural
-         parsers scientific semigroupoids semigroups tagged text
-         transformers vector witherable wl-pprint-annotated zippers
+         attoparsec base bifunctors bytestring containers contravariant
+         digit distributive errors generics-sop hoist-error
+         hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph
+         mtl nats natural parsers scientific semigroupoids semigroups tagged
+         text transformers unordered-containers vector witherable
+         wl-pprint-annotated zippers
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers contravariant digit directory
          distributive doctest filepath generics-sop hedgehog hedgehog-fn
          lens mtl natural scientific semigroupoids semigroups tagged tasty
-         tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell
-         text vector zippers
+         tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit
+         template-haskell text unordered-containers vector zippers
        ];
        description = "JSON wrangling";
        license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch
new file mode 100644
index 000000000000..ebadd215cb76
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch
@@ -0,0 +1,82 @@
+diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs
+index 712007006..6be92ec6d 100644
+--- a/src/Servant/Client/Core/Internal/HasClient.hs
++++ b/src/Servant/Client/Core/Internal/HasClient.hs
+@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where
+ import           Prelude ()
+ import           Prelude.Compat
+ 
++import           Control.Concurrent.MVar
++                 (modifyMVar, newMVar)
+ import qualified Data.ByteString                        as BS
+ import qualified Data.ByteString.Lazy                   as BL
+ import           Data.Foldable
+@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types                     as H
+ import           Servant.API
+                  ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData,
+                  BuildHeadersTo (..), Capture', CaptureAll, Description,
+-                 EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header',
+-                 Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender),
++                 EmptyAPI, FramingRender (..), FramingUnrender (..),
++                 FromSourceIO (..), Header', Headers (..), HttpVersion,
++                 IsSecure, MimeRender (mimeRender),
+                  MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag,
+                  QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost,
+                  ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData,
+-                 Vault, Verb, WithNamedContext, contentType, getHeadersHList,
+-                 getResponse, toQueryParam, toUrlPiece)
++                 ToSourceIO (..), Vault, Verb, WithNamedContext, contentType,
++                 getHeadersHList, getResponse, toQueryParam, toUrlPiece)
+ import           Servant.API.ContentTypes
+                  (contentTypes)
+ import           Servant.API.Modifiers
+@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api)
+     hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
+ 
+ instance
+-    ( HasClient m api
++    ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a
+     ) => HasClient m (StreamBody' mods framing ctype a :> api)
+   where
+ 
+@@ -547,7 +550,39 @@ instance
+     hoistClientMonad pm _ f cl = \a ->
+       hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
+ 
+-    clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody"
++    clientWithRoute pm Proxy req body
++        = clientWithRoute pm (Proxy :: Proxy api)
++        $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req
++      where
++        ctypeP   = Proxy :: Proxy ctype
++        framingP = Proxy :: Proxy framing
++
++        sourceIO = framingRender
++            framingP
++            (mimeRender ctypeP :: chunk -> BL.ByteString)
++            (toSourceIO body)
++
++        -- not pretty.
++        givesPopper :: (IO BS.ByteString -> IO ()) -> IO ()
++        givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do
++            ref <- newMVar step0
++
++            -- Note sure we need locking, but it's feels safer.
++            let popper :: IO BS.ByteString
++                popper = modifyMVar ref nextBs
++
++            needsPopper popper
++
++        nextBs S.Stop          = return (S.Stop, BS.empty)
++        nextBs (S.Error err)   = fail err
++        nextBs (S.Skip s)      = nextBs s
++        nextBs (S.Effect ms)   = ms >>= nextBs
++        nextBs (S.Yield lbs s) = case BL.toChunks lbs of
++            []     -> nextBs s
++            (x:xs) | BS.null x -> nextBs step'
++                   | otherwise -> return (step', x)
++                where
++                  step' = S.Yield (BL.fromChunks xs) s
+
+
+
diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 31820eff7e53..988b4195aa2e 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -2,50 +2,50 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.5.3)
+    cocoapods (1.6.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
+      cocoapods-core (= 1.6.0)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.3, >= 1.3.1)
+      xcodeproj (>= 1.8.0, < 2.0)
+    cocoapods-core (1.6.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -55,11 +55,11 @@ GEM
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    ruby-macho (1.2.0)
+    ruby-macho (1.3.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.6.0)
+    xcodeproj (1.8.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -73,4 +73,4 @@ DEPENDENCIES
   cocoapods
 
 BUNDLED WITH
-   1.16.3
+   1.17.2
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 5fcbe59603b9..4239b29a2c3a 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -1,12 +1,14 @@
 {
   activesupport = {
     dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
+      sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
       type = "gem";
     };
-    version = "4.2.10";
+    version = "4.2.11";
   };
   atomos = {
     source = {
@@ -34,21 +36,25 @@
   };
   cocoapods = {
     dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h";
+      sha256 = "173zvbld289ikvicwj2gqsv9hkvbxz7cswx21c7mh0gznsad1gsx";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.6.0";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39";
+      sha256 = "1q0xd24pqa1biqrg597yhsrgzgi4msk3nr00gfxi40nfqnryvmyl";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.6.0";
   };
   cocoapods-deintegrate = {
     source = {
@@ -59,12 +65,14 @@
     version = "1.0.2";
   };
   cocoapods-downloader = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g1v3k52g2mjlml8miq06c61764lqdy0gc0h2f4ymajz0pqg1zik";
+      sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.2.2";
   };
   cocoapods-plugins = {
     dependencies = ["nap"];
@@ -84,12 +92,14 @@
     version = "1.0.0";
   };
   cocoapods-stats = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid";
+      sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.1.0";
   };
   cocoapods-trunk = {
     dependencies = ["nap" "netrc"];
@@ -117,12 +127,14 @@
     version = "3.1.2";
   };
   concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.4";
   };
   escape = {
     source = {
@@ -133,12 +145,14 @@
     version = "0.0.4";
   };
   fourflusher = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5";
+      sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.2.0";
   };
   fuzzy_match = {
     source = {
@@ -206,12 +220,14 @@
     version = "0.11.0";
   };
   ruby-macho = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xi0ll217h3caiamplqaypmipmrkriqrvmq207ngyzhgmh1jfc8q";
+      sha256 = "106xrrinbhxd8z6x94j32abgd2w3rml0afj2rk2n6jshyj6141al";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.1";
   };
   thread_safe = {
     source = {
@@ -232,11 +248,13 @@
   };
   xcodeproj = {
     dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7";
+      sha256 = "1hyahdwz0nfmzw9v6h5rwvnj5hxa0jwqyagmpn1k1isxb1vks70w";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.8.0";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update
index 58a7bd4a4539..8215d1abe4fd 100755
--- a/pkgs/development/mobile/cocoapods/update
+++ b/pkgs/development/mobile/cocoapods/update
@@ -1,10 +1,11 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p bash ruby bundler bundix
 
-rm Gemfile.lock
-bundler install
-bundix
+BUNDIX_CACHE="$(mktemp -d)"
 
-if [ "clean" == "$1" ]; then
-  rm -rf ~/.gem
-fi
+rm -f Gemfile.lock
+bundler package --path "$BUNDIX_CACHE"
+bundix --bundle-pack-path="$BUNDIX_CACHE"
+
+rm -rf "$BUNDIX_CACHE"
+rm -rf .bundle
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 73bea1c7da69..4b2877250821 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -32,14 +32,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.29.3";
+  name = "busybox-1.30.1";
 
   # Note to whoever is updating busybox: please verify that:
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
   # still builds after the update.
   src = fetchurl {
     url = "https://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p";
+    sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x";
   };
 
   hardeningDisable = [ "format" "pie" ]
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-24 16:09:11 +0000