diff options
Diffstat (limited to 'pkgs/development')
20 files changed, 742 insertions, 190 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 33f498d922b0..56ffd6ee54ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "069w4gdb104lc3vp48k3wywmgql56yc5g2g2i240xrr88in3qvqw"; + sha256 = "0mgmxcr36b86jh56my3vhp9y4cravi0hbppa463q3c21a1cmjc19"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -370,6 +370,7 @@ self: super: { safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; scp-streams = dontCheck super.scp-streams; + sdl2 = dontCheck super.sdl2; # the test suite needs an x server sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention separated = dontCheck super.separated; shadowsocks = dontCheck super.shadowsocks; @@ -1150,4 +1151,7 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; + # https://github.com/DanielG/cabal-helper/issues/59 + cabal-helper = doJailbreak super.cabal-helper; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index b92777276504..bf021956593c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -46,7 +46,7 @@ self: super: { # LTS-12.x versions do not compile. base-orphans = self.base-orphans_0_8; - brick = doJailbreak super.brick_0_41_2; # https://github.com/jtdaugherty/brick/pull/188 + brick = self.brick_0_41_2; cassava-megaparsec = doJailbreak super.cassava-megaparsec; config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 contravariant = self.contravariant_1_5; @@ -69,6 +69,7 @@ self: super: { megaparsec = dontCheck (doJailbreak super.megaparsec); neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF patience = markBrokenVersion "0.1.1" super.patience; + polyparse = self.polyparse_1_12_1; primitive = self.primitive_0_6_4_0; QuickCheck = self.QuickCheck_2_12_6_1; semigroupoids = self.semigroupoids_5_3_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b85a564e31b..aa96bebc21b8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.4.3 +compiler: ghc-8.4.4 core-packages: - array-0.5.2.0 @@ -12,12 +12,12 @@ core-packages: - deepseq-1.4.3.0 - directory-1.3.1.5 - filepath-1.4.2 - - ghc-8.4.3 - - ghc-boot-8.4.3 - - ghc-boot-th-8.4.3 + - ghc-8.4.4 + - ghc-boot-8.4.4 + - ghc-boot-th-8.4.4 - ghc-compact-0.1.0.0 - ghc-prim-0.5.2.0 - - ghci-8.4.3 + - ghci-8.4.4 - haskeline-0.7.4.2 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 @@ -26,10 +26,10 @@ core-packages: - pretty-1.1.3.6 - process-1.6.3.0 - rts-1.0 - - stm-2.4.5.0 + - stm-2.4.5.1 - template-haskell-2.13.0.0 - terminfo-0.4.1.1 - - text-1.2.3.0 + - text-1.2.3.1 - time-1.8.0.2 - transformers-0.5.5.0 - unix-2.7.2.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bb6e6da1e0cb..34c638217563 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30439,8 +30439,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.3.0"; - sha256 = "0yirmngvkmkxdbhh3r6b1j9385hhwnqpr6mmw9kf50axd7czx421"; + version = "3.2.4.0"; + sha256 = "0pj7zyf38rbi48lh8jhcm54wrflkdyh1583d9h4iy9nj5apa85ip"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -31563,7 +31563,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_3_6_1" = callPackage + "avro_0_4_0_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, directory, entropy , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib @@ -31572,8 +31572,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.6.1"; - sha256 = "0b1pj47nfpbqvcp5vzraa1przq1c9ll8n76qbyg05fjfvamycbq3"; + version = "0.4.0.0"; + sha256 = "1cly3x4lmibcjm5sz68s2fncakpx2cfvyimv4ck1mm5v94yfp8pi"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -33786,6 +33786,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bazel-runfiles" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "bazel-runfiles"; + version = "0.7.0.1"; + sha256 = "000awjykargiirnmb3nfqp8dk1p87f5aqx2d07nxrrgflxs7y8ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base filepath ]; + description = "Locate Bazel runfiles location"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bbdb" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -47925,8 +47939,8 @@ self: { }: mkDerivation { pname = "cloben"; - version = "0.1.0.3"; - sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2"; + version = "0.1.1.0"; + sha256 = "14vkga43sm995rg4s4npjca7xslgs33kl1ivknbflfidvgpdlxmb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50289,8 +50303,8 @@ self: { }: mkDerivation { pname = "compdata-fixplate"; - version = "0.1.2"; - sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz"; + version = "0.1.3"; + sha256 = "1b9xmp2lps9k9fvvpqlha0vkncs4pivixyyqs71zl4dxcrsa8ryx"; libraryHaskellDepends = [ base composition containers deriving-compat fixplate tree-view ]; @@ -54868,8 +54882,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.25"; - sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5"; + version = "5.9.27"; + sha256 = "016f5rzn2dvd85mdjcdrc7jmy4v75sa4qf98rqyp8qc8cpcqcx4c"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl random @@ -61900,6 +61914,8 @@ self: { pname = "deriving-compat"; version = "0.5.2"; sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9"; + revision = "1"; + editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -85876,19 +85892,20 @@ self: { , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath , free, git, gnupg, hinotify, hslogger, http-client , http-client-tls, http-conduit, http-types, IfElse, lsof, magic - , memory, monad-control, monad-logger, mountpoints, mtl, network - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, perl, persistent, persistent-sqlite - , persistent-template, process, QuickCheck, random, regex-tdfa - , resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split - , stm, stm-chans, tagsoup, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, torrent, transformers, unix, unix-compat - , unordered-containers, utf8-string, uuid, vector, wget, which + , memory, microlens, monad-control, monad-logger, mountpoints, mtl + , network, network-info, network-multicast, network-uri, old-locale + , openssh, optparse-applicative, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck + , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi + , securemem, socks, split, stm, stm-chans, tagsoup, tasty + , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time, torrent + , transformers, unix, unix-compat, unordered-containers + , utf8-string, uuid, vector, wget, which }: mkDerivation { pname = "git-annex"; - version = "6.20181011"; - sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf"; + version = "7.20181031"; + sha256 = "02h3c77mdlr4c6l7c14ai0i2kq8c7pawvsf33my449b1srviazlm"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85907,7 +85924,7 @@ self: { crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist edit-distance esqueleto exceptions fdo-notify feed filepath free hinotify hslogger http-client http-client-tls - http-conduit http-types IfElse magic memory monad-control + http-conduit http-types IfElse magic memory microlens monad-control monad-logger mountpoints mtl network network-info network-multicast network-uri old-locale optparse-applicative persistent persistent-sqlite persistent-template process QuickCheck random @@ -94388,8 +94405,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.14.0"; - sha256 = "0cypqvl04fd0gdakl2kf087fjy6qw968isx2hmli5z5gza18hl0b"; + version = "1.15.0"; + sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100220,8 +100237,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.3"; - sha256 = "149k9b11c0dj3qqdbinwqnjxy8bxmc4bk65lfxpic2zy26n46k7q"; + version = "0.9.4"; + sha256 = "1lwlbi5pw9wngmhk6dkyc05ahq1w1a0jxipkf9g5spq7ipfw4v6y"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra data-default hashable haskoin-core monad-logger mtl network nqe random resourcet @@ -100292,8 +100309,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.4.2"; - sha256 = "0fjp566icp76dqhivl9jn3s3k2fvxmjysj4rpmrvwfyzb7snlqvp"; + version = "0.6.0"; + sha256 = "1qzxx1rbwv792f96wcsqmbsshd6qf34fqj6byi17la51s900zr09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100556,6 +100573,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasktorch" = callPackage + ({ mkDerivation, backprop, base, dimensions, generic-lens + , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-ffi-thc + , hasktorch-indef, hasktorch-signatures-partial, hasktorch-types-th + , hasktorch-types-thc, hspec, microlens-platform, monad-loops, mtl + , QuickCheck, safe-exceptions, singletons, text, time, transformers + }: + mkDerivation { + pname = "hasktorch"; + version = "0.0.1.0"; + sha256 = "10lmas8x4nk7z7phxj1a2bhzjz7qhbmy472f9j584mbagvklfkmc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dimensions hasktorch-ffi-th hasktorch-ffi-thc hasktorch-indef + hasktorch-signatures-partial hasktorch-types-th hasktorch-types-thc + safe-exceptions singletons text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + backprop base dimensions generic-lens ghc-typelits-natnormalise + hspec microlens-platform monad-loops mtl QuickCheck singletons time + transformers + ]; + doHaddock = false; + description = "Torch for tensors and neural networks in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasktorch-codegen" = callPackage ({ mkDerivation, base, containers, directory, hashable, hspec , hspec-discover, megaparsec, optparse-applicative, pretty-show @@ -100563,8 +100609,8 @@ self: { }: mkDerivation { pname = "hasktorch-codegen"; - version = "0.0.1.0"; - sha256 = "0s48myr8k96kb0mwvfcc9h5razp8y5k8dk987hfg101h2nfz5k10"; + version = "0.0.1.1"; + sha256 = "0yygx1w7i9mnyxrqzz94vrni5y7rkn92yycax7rqg2r5cds2xb6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100583,6 +100629,180 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasktorch-ffi-tests" = callPackage + ({ mkDerivation, base, hasktorch-types-th, hspec, QuickCheck, text + }: + mkDerivation { + pname = "hasktorch-ffi-tests"; + version = "0.0.1.0"; + sha256 = "0850v3wqf0x5hkk5py7k1glh591p59fs1y1kn2jf2giqmy05qzlc"; + libraryHaskellDepends = [ + base hasktorch-types-th hspec QuickCheck text + ]; + description = "Testing library for Hasktorch's FFI bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-ffi-th" = callPackage + ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests + , hasktorch-types-th, hspec, inline-c, QuickCheck, text + }: + mkDerivation { + pname = "hasktorch-ffi-th"; + version = "0.0.1.0"; + sha256 = "10gdvkwcjjzmrvmlz8vf823ja1jpab1nrph5lq46fcz8nqycsjq0"; + libraryHaskellDepends = [ base hasktorch-types-th inline-c text ]; + librarySystemDepends = [ ATen ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text + ]; + description = "Bindings to Torch"; + license = stdenv.lib.licenses.bsd3; + }) {ATen = null;}; + + "hasktorch-ffi-thc" = callPackage + ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests + , hasktorch-ffi-th, hasktorch-types-th, hasktorch-types-thc, hspec + , inline-c, QuickCheck, text + }: + mkDerivation { + pname = "hasktorch-ffi-thc"; + version = "0.0.1.0"; + sha256 = "0l3xvhdyn2dzw999fbhihl20s3q01r5vp247d0rh27zvyszg7l3y"; + libraryHaskellDepends = [ + base hasktorch-types-th hasktorch-types-thc inline-c text + ]; + librarySystemDepends = [ ATen ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base hasktorch-ffi-tests hasktorch-ffi-th hasktorch-types-th + hasktorch-types-thc hspec QuickCheck text + ]; + description = "Bindings to Cutorch"; + license = stdenv.lib.licenses.bsd3; + }) {ATen = null;}; + + "hasktorch-indef" = callPackage + ({ mkDerivation, backprop, base, containers, deepseq, dimensions + , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-signatures + , hasktorch-signatures-partial, hasktorch-signatures-support + , hasktorch-types-th, hspec, managed, mtl, QuickCheck + , safe-exceptions, singletons, text, transformers, vector + }: + mkDerivation { + pname = "hasktorch-indef"; + version = "0.0.1.0"; + sha256 = "0xmz7jid3sg3d2b4q1051fs7g0fljgvqxqwhzhd4g85fx7zr5nk3"; + libraryHaskellDepends = [ + backprop base containers deepseq dimensions + ghc-typelits-natnormalise hasktorch-ffi-th hasktorch-signatures + hasktorch-signatures-partial hasktorch-signatures-support + hasktorch-types-th managed mtl safe-exceptions singletons text + transformers vector + ]; + testHaskellDepends = [ + backprop base dimensions ghc-typelits-natnormalise hasktorch-ffi-th + hasktorch-types-th hspec mtl QuickCheck singletons text + transformers + ]; + doHaddock = false; + description = "Core Hasktorch abstractions wrapping FFI bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures" = callPackage + ({ mkDerivation, base, hasktorch-ffi-th, hasktorch-ffi-thc + , hasktorch-signatures-partial, hasktorch-signatures-support + , hasktorch-signatures-types, hasktorch-types-th + , hasktorch-types-thc + }: + mkDerivation { + pname = "hasktorch-signatures"; + version = "0.0.1.0"; + sha256 = "1p8c3h0naqcbjxb3jbiss9zgfyg0hj0wcb6qlid6kwy925i4cyk1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hasktorch-signatures-partial hasktorch-signatures-support + hasktorch-signatures-types hasktorch-types-th hasktorch-types-thc + ]; + executableHaskellDepends = [ + base hasktorch-ffi-th hasktorch-ffi-thc hasktorch-types-th + hasktorch-types-thc + ]; + doHaddock = false; + description = "Backpack signatures for Tensor operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures-partial" = callPackage + ({ mkDerivation, base, hasktorch-signatures-types + , hasktorch-types-th + }: + mkDerivation { + pname = "hasktorch-signatures-partial"; + version = "0.0.1.0"; + sha256 = "12dc5i4818j4q09mdshygz16zq1zyp32k6c1imgp9dl6bl4l05ss"; + libraryHaskellDepends = [ + base hasktorch-signatures-types hasktorch-types-th + ]; + description = "Functions to partially satisfy tensor signatures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures-support" = callPackage + ({ mkDerivation, base, hasktorch-signatures-types + , hasktorch-types-th + }: + mkDerivation { + pname = "hasktorch-signatures-support"; + version = "0.0.1.0"; + sha256 = "1vfmpsmgak4ifhpqh15ycf01p8l3a5qas3m7lkg09y8mqimwq5hh"; + libraryHaskellDepends = [ + base hasktorch-signatures-types hasktorch-types-th + ]; + doHaddock = false; + description = "Signatures for support tensors in hasktorch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-signatures-types" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "hasktorch-signatures-types"; + version = "0.0.1.0"; + sha256 = "0zaa0ihgbsiwqla46dixmxki75miy5dz91agvvd147rmr2khx1j2"; + libraryHaskellDepends = [ base deepseq ]; + doHaddock = false; + description = "Core types for Hasktorch backpack signatures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-types-th" = callPackage + ({ mkDerivation, base, c2hs, inline-c }: + mkDerivation { + pname = "hasktorch-types-th"; + version = "0.0.1.0"; + sha256 = "0irlf1lvadnr3j3zjakvkvrwdw8gpg5smk69w9l54idwsi6yvhdd"; + libraryHaskellDepends = [ base inline-c ]; + libraryToolDepends = [ c2hs ]; + description = "C-types for Torch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasktorch-types-thc" = callPackage + ({ mkDerivation, base, c2hs, hasktorch-types-th, inline-c }: + mkDerivation { + pname = "hasktorch-types-thc"; + version = "0.0.1.0"; + sha256 = "06jxjn9s34myy4v8ad42xqmkyad5qraj99a3vpcxfagjxwcn4hbd"; + libraryHaskellDepends = [ base hasktorch-types-th inline-c ]; + libraryToolDepends = [ c2hs ]; + description = "C-types for Cutorch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-binary" = callPackage ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils , mtl, QuickCheck, tasty, tasty-quickcheck @@ -107893,8 +108113,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.8.0"; - sha256 = "02pirdgq1l638n126qj6sccfkjc6scxl53m584fxq79gfdwarx2q"; + version = "1.8.1"; + sha256 = "1b2rjqd8q0ybx26pmmsb1am9v6pnbp0xb3fzqvivxppdr5z6kl29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111060,17 +111280,18 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude - , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream - , language-ats, microlens, optparse-generic, system-filepath + , cpphs, criterion, deepseq, haskell-src-exts, hspec + , hspec-dirstream, language-ats, microlens, optparse-generic + , system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.4.0.0"; - sha256 = "1564xybdqli5i3096xmccy6z0xgm5yvfmjmz60r9ny3h54ahlj7r"; + version = "0.5.0.0"; + sha256 = "0ga90mkz11iis5knd51dqpqd4qyj6fwl15nbdbwzlynpk0wsdsga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base casing composition-prelude deepseq + ansi-wl-pprint base casing composition-prelude cpphs deepseq haskell-src-exts language-ats microlens ]; executableHaskellDepends = [ base optparse-generic ]; @@ -114182,6 +114403,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {seccomp = null;}; + "hssh" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, containers + , cryptonite, data-default, memory, stm, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "hssh"; + version = "0.1.0.0"; + sha256 = "00g87418fhzcxf1xmrj9s40g6i1cgjx65ki027sqgkss49w1w6ig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring cereal containers cryptonite data-default + memory stm + ]; + testHaskellDepends = [ + async base bytestring cereal containers cryptonite data-default + memory stm tasty tasty-hunit tasty-quickcheck + ]; + description = "SSH protocol implementation"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsshellscript" = callPackage ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { @@ -117583,6 +117827,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_6_2_18" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups + , transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.18"; + sha256 = "1sm6rji0vv3ddi4sjp1q8nz271a084xpnv86n0adqzvd7b7sihip"; + libraryHaskellDepends = [ + base bytestring mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -117731,8 +117999,8 @@ self: { }: mkDerivation { pname = "hw-streams"; - version = "0.0.0.4"; - sha256 = "08dmcbvw3z53plzgq5z3pa9ns9rjj0xs9rx70pyfrqrrc2f98hwi"; + version = "0.0.0.5"; + sha256 = "0qhpkgxip9bnx6bcg1cnz9gbnwifkp9vinvp89152h720rsawh4i"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -122172,8 +122440,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.32"; - sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0"; + version = "0.1.34"; + sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -122437,15 +122705,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "intro_0_5_1_0" = callPackage + "intro_0_5_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, dlist , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.5.1.0"; - sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs"; + version = "0.5.2.1"; + sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8"; libraryHaskellDepends = [ base bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -122559,6 +122827,8 @@ self: { pname = "invariant"; version = "0.5.1"; sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b"; + revision = "1"; + editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -130164,13 +130434,17 @@ self: { }) {}; "language-elm" = callPackage - ({ mkDerivation, base, hspec, MissingH, mtl, pretty, protolude }: + ({ mkDerivation, base, doctest, hspec, MissingH, mtl, pretty + , protolude + }: mkDerivation { pname = "language-elm"; - version = "0.1.0.3"; - sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz"; + version = "0.1.1.0"; + sha256 = "0hg9b8cyw08gwbsdmqhadnx0clj3rvjavrd3hw597bh2iss3rafl"; libraryHaskellDepends = [ base MissingH mtl pretty protolude ]; + libraryToolDepends = [ doctest ]; testHaskellDepends = [ base hspec mtl pretty protolude ]; + testToolDepends = [ doctest ]; description = "Generate elm code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132529,8 +132803,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.1.0.0"; - sha256 = "0qw6nvhlczqywwzinsj0x5p2xw8490bbizl2lmj48dr71mndxdz0"; + version = "1.1.0.1"; + sha256 = "1psb3ywbzg6k0cir5bxphjqmbzd0n1l2w3skkr31px79haa4wbm7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141302,7 +141576,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_2" = callPackage + "megaparsec_7_0_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -141310,8 +141584,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.2"; - sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278"; + version = "7.0.3"; + sha256 = "1zngs6x7d1yp192pg8b0j5banq4y1vr1fwh1mxrxx0834bmqrll0"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -145988,12 +146262,17 @@ self: { }) {}; "monopati" = callPackage - ({ mkDerivation, base, directory, free, split }: + ({ mkDerivation, base, directory, free, hedgehog, split + , transformers + }: mkDerivation { pname = "monopati"; - version = "0.1.2"; - sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8"; + version = "0.1.3"; + sha256 = "1g7n1m6df2c9rl99fii7x4a7z3xwv2mcvxd96gg1maji9709chqb"; libraryHaskellDepends = [ base directory free split ]; + testHaskellDepends = [ + base directory free hedgehog split transformers + ]; description = "Well-typed paths"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -147415,6 +147694,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multilinear" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, mwc-random + , primitive, statistics, vector + }: + mkDerivation { + pname = "multilinear"; + version = "0.2.2.1"; + sha256 = "0clqjf37gsgkc2lghrvdqjpzxxx1ly4zymkcflaph5x3klqlv4xy"; + libraryHaskellDepends = [ + base containers deepseq mwc-random primitive statistics vector + ]; + testHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Comprehensive and efficient (multi)linear algebra implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multilinear-io" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector + , criterion, csv-enumerator, deepseq, either, multilinear + , transformers, vector, zlib + }: + mkDerivation { + pname = "multilinear-io"; + version = "0.2.1.2"; + sha256 = "12kydrh8rzvwlgd634x6swd1yv9pyxa23yh2yxj86mnisb467llj"; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-vector csv-enumerator either + multilinear transformers vector zlib + ]; + testHaskellDepends = [ base either multilinear transformers ]; + benchmarkHaskellDepends = [ + base criterion deepseq either multilinear transformers + ]; + description = "Input/output capability for multilinear package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multimap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -148958,6 +149275,68 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "n2o" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, text + }: + mkDerivation { + pname = "n2o"; + version = "0.11.1"; + sha256 = "0yvgis2v2jgdny50py8xmc9b1p2zi5kjgf45xsgsyyhzjyr30kb7"; + libraryHaskellDepends = [ base binary bytestring containers text ]; + testHaskellDepends = [ base hspec ]; + description = "Abstract Protocol Loop"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "n2o-nitro" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , containers, n2o, text + }: + mkDerivation { + pname = "n2o-nitro"; + version = "0.11.2"; + sha256 = "1vh0r03h0k60z4q722pw4h5q0l7l56fmyp57im0nankci8vj0s38"; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring containers n2o text + ]; + description = "Nitro Elements, Events and Actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "n2o-protocols" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , containers, n2o, n2o-nitro, time + }: + mkDerivation { + pname = "n2o-protocols"; + version = "0.11.2"; + sha256 = "1w5r99k9wvhbwvx0hzgpn1aahhnb84ib0n7xgq1ybpgy3s9cggzk"; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring containers n2o n2o-nitro + time + ]; + description = "N2O Protocols Starter Pack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "n2o-web" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, case-insensitive, containers, n2o, n2o-protocols + , network, text, websockets + }: + mkDerivation { + pname = "n2o-web"; + version = "0.11.2"; + sha256 = "0d01lsfd2rwavzm01bkk3020r0wpfqyyqjbdf1pc8hw1im3843p6"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + case-insensitive containers n2o n2o-protocols network text + websockets + ]; + description = "N2O adapter for WebSockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nagios-check" = callPackage ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl , QuickCheck, text @@ -151891,8 +152270,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.2.1.0"; - sha256 = "1xavggdab7khi8isvrcf85xlrxhy852fb2ccj7jhmdnfmqzbzyyq"; + version = "0.2.1.1"; + sha256 = "0z406bmfk9b1b6knpxwzkwh8n2cpfwgxdh52vghpgjf69c0yrjq1"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -153703,17 +154082,19 @@ self: { }) {}; "nuxeo" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, conduit - , conduit-extra, optparse-applicative, text, time + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , conduit-extra, http-conduit, http-types, optparse-applicative + , text, time, url }: mkDerivation { pname = "nuxeo"; - version = "0.3.0.2"; - sha256 = "1h0asiqlffy0wy76q2dz7id6nzsid5nqkmsy1mxdl77zm3d9id4f"; + version = "0.3.2"; + sha256 = "0m0rnrcay92vi47dd6cbba5vdjzdrmwb9s7wic95cbsb7wmajc72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring conduit conduit-extra text time + aeson attoparsec base bytestring conduit conduit-extra http-conduit + http-types text time url ]; executableHaskellDepends = [ base optparse-applicative text ]; license = stdenv.lib.licenses.bsd3; @@ -156279,8 +156660,8 @@ self: { }: mkDerivation { pname = "order-statistic-tree"; - version = "0.1.1.0"; - sha256 = "1gcjlvb0wbjkb3vg1bsiqip3wmacpvbc3s96f0vcm67dssdaws80"; + version = "0.1.1.1"; + sha256 = "13fhnbsx95w79r7lb1mfah8hj3cp6cqpphy31ajc6gcnzbiaqgk5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ @@ -156323,8 +156704,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.1.0"; - sha256 = "11smyc3z6xhb8j23wlgvvs8dvr82xmzpx2nhvkzazmgzrx3rf26b"; + version = "0.1.1"; + sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -156411,8 +156792,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.2.2"; - sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r"; + version = "0.3.0"; + sha256 = "0p1lb3ba060nnr3msqzqy0ymbm4i0nkmwix8xx5zz6hir74ix3y9"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable old-locale semigroups text thyme unordered-containers @@ -157629,10 +158010,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.0.2.0"; - sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc"; - revision = "1"; - editedCabalFile = "0zmvgzqhb4cggsr3m5xw1lhcns586jq5b0s9fhpwq1c3c6k5nq96"; + version = "1.0.3.0"; + sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158995,8 +159374,8 @@ self: { }: mkDerivation { pname = "parsers-megaparsec"; - version = "0.1.0.0"; - sha256 = "1xn12jbxv72hgkp9xarm9nr9rpqcijlyma47y31jz985r32nhaxj"; + version = "0.1.0.1"; + sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8"; libraryHaskellDepends = [ base fail megaparsec mtl parsers semigroups text transformers ]; @@ -161604,6 +161983,26 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template-classy" = callPackage + ({ mkDerivation, base, lens, persistent, persistent-sqlite + , persistent-template, template-haskell, text + }: + mkDerivation { + pname = "persistent-template-classy"; + version = "0.1.0.1"; + sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a"; + libraryHaskellDepends = [ + base lens persistent persistent-sqlite persistent-template + template-haskell text + ]; + testHaskellDepends = [ + base lens persistent persistent-sqlite persistent-template + template-haskell text + ]; + description = "Generate classy lens field accessors for persistent models"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-test" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base , base64-bytestring, blaze-builder, blaze-html, blaze-markup @@ -163959,6 +164358,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pixela" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, http-client + , http-client-tls, http-types, split, text, unordered-containers + , uri-encode, vector + }: + mkDerivation { + pname = "pixela"; + version = "0.1.0.0"; + sha256 = "02ab3n56j3y93wrwdj8rd3ff9zw9kskily1s9j2yq49zwpjnilpj"; + revision = "3"; + editedCabalFile = "0kndzh00saxdinyz5hbqkir9n578fz8db291nqynqpymw6lwkyc3"; + libraryHaskellDepends = [ + aeson base bytestring data-default http-client http-client-tls + http-types split text unordered-containers uri-encode vector + ]; + testHaskellDepends = [ + aeson base bytestring data-default http-client http-client-tls + http-types split text unordered-containers uri-encode vector + ]; + description = "Pixela client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pixelated-avatar-generator" = callPackage ({ mkDerivation, async, base, bytestring, cli, hspec, JuicyPixels , pureMD5, QuickCheck, random, split @@ -165677,6 +166099,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "port-utils" = callPackage + ({ mkDerivation, async, base, hspec, network, stm }: + mkDerivation { + pname = "port-utils"; + version = "0.1.0.2"; + sha256 = "0a27xsz4agm4bf1i8nrsmlz509yv65fvf3a8pzaqm6qxj7ir7g8i"; + libraryHaskellDepends = [ base network ]; + testHaskellDepends = [ async base hspec network stm ]; + description = "Utilities for creating and waiting on ports"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "portable-lines" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -175656,8 +176090,8 @@ self: { pname = "recursion-schemes"; version = "5.0.3"; sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; - revision = "2"; - editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7"; + revision = "3"; + editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -181028,15 +181462,15 @@ self: { }: mkDerivation { pname = "rounded"; - version = "0.1"; - sha256 = "02xlc369yi8wvf41z4d3291i63rcryl0yjp0k5lkn3c2f0k5w244"; + version = "0.1.0.1"; + sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls"; libraryHaskellDepends = [ base ghc-prim hgmp long-double reflection singletons ]; librarySystemDepends = [ gmp mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; - license = "LGPL"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounding" = callPackage @@ -181490,6 +181924,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rstream" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "rstream"; + version = "0.1.0.0"; + sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "stream-fusion framework from vector"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rtcm" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring @@ -188261,7 +188706,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_8_1" = callPackage + "serverless-haskell_0_8_2" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq @@ -188269,8 +188714,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.1"; - sha256 = "1s5i2l57s0crpk3lysdw0v7kvfx567bhl0v5i18mdsa331bifcpd"; + version = "0.8.2"; + sha256 = "1ia1vjiw71qkqdpbna2jgxznwlhbh184fr5m95dcyl5kwwlb3nb8"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -189198,8 +189643,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.1.0"; - sha256 = "1b5mbb3azjn2wwagciayd5lyb6jd2siwn1l9ispnqrkrh1bqgzb5"; + version = "1.10.2.0"; + sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -190004,6 +190449,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shh" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath, mtl + , process, split, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, unix + }: + mkDerivation { + pname = "shh"; + version = "0.1.0.0"; + sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base deepseq directory filepath mtl process split + template-haskell unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Simple shell scripting from Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shift" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , composition-prelude, data-default, microlens @@ -194872,8 +195338,8 @@ self: { }: mkDerivation { pname = "socket"; - version = "0.8.1.0"; - sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0"; + version = "0.8.2.0"; + sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -201243,8 +201709,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "2.2.0.0"; - sha256 = "1ia9xbbshzx0p69i8gq3y88qbg60cks52kb6hxm2ylkm7jnzgxzj"; + version = "2.2.1.0"; + sha256 = "1b75wnmprbb4sfnwyn5arc205ad5rlyz4hv63ai35i9iryax875s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205919,6 +206385,8 @@ self: { pname = "tdigest"; version = "0.2.1"; sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; + revision = "1"; + editedCabalFile = "1jrq22j9jbvx31pspwjvyb539gix7vfb8cinqkkb2abmr0jrhibn"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers @@ -208393,6 +208861,8 @@ self: { pname = "text-show"; version = "3.7.5"; sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; + revision = "1"; + editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -211983,8 +212453,8 @@ self: { }: mkDerivation { pname = "toodles"; - version = "0.1.0.16"; - sha256 = "1xr9cl69v5m08d44xgprlpk9j5j2lby84lzcp3fjzlvfdnnx0q72"; + version = "0.1.1"; + sha256 = "1g806bdm6l52yg6q3jni94iacp7sfdacfx6rddnsdzqb0cj6ym0w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -217582,7 +218052,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_4_0" = callPackage + "universum_1_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -217590,8 +218060,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.4.0"; - sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk"; + version = "1.5.0"; + sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -218444,8 +218914,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; - version = "0.1.0.6"; - sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq"; + version = "0.1.0.7"; + sha256 = "16zg0fsxzdii72119jyhn2g2gy7j6pk7r8i7w5hk9a353kmvb43y"; libraryHaskellDepends = [ aeson base bytestring text uri-bytestring ]; @@ -221760,23 +222230,24 @@ self: { "voicebase" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL - , http-client, http-client-openssl, json-autotype, lens, mime-types - , optparse-applicative, text, wreq + , hspec, http-client, http-client-openssl, lens, lens-aeson + , mime-types, mtl, optparse-applicative, roundtrip, roundtrip-aeson + , text, wreq }: mkDerivation { pname = "voicebase"; - version = "0.1.1.4"; - sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78"; + version = "0.2.0.0"; + sha256 = "0ih0z27vz7767gr11lz227vb84i2kwc6wn9z1yd0zma5nj8x73hw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl - json-autotype lens mime-types text wreq + lens lens-aeson mime-types mtl roundtrip roundtrip-aeson text wreq ]; executableHaskellDepends = [ aeson base bytestring filepath mime-types optparse-applicative text ]; - testHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base hspec roundtrip-aeson ]; description = "Upload audio files to voicebase to get a transcription"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -222062,6 +222533,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "waargonaut" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal + , cabal-doctest, containers, contravariant, digit, directory + , distributive, doctest, errors, filepath, generics-sop, hedgehog + , hoist-error, hw-balancedparens, hw-bits, hw-json, hw-prim + , hw-rankselect, lens, mmorph, mtl, nats, parsers, scientific + , semigroups, tagged, tasty, tasty-expected-failure, tasty-hedgehog + , tasty-hunit, template-haskell, text, transformers, vector + , witherable, wl-pprint-annotated, zippers + }: + mkDerivation { + pname = "waargonaut"; + version = "0.1.0.0"; + sha256 = "0y3h1kgh7n639h714ji4fycj6b8vcsa79jfv36w995p9gbjxxdjc"; + 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 parsers + scientific semigroups tagged text transformers vector witherable + wl-pprint-annotated zippers + ]; + testHaskellDepends = [ + attoparsec base bytestring digit directory distributive doctest + filepath generics-sop hedgehog lens scientific semigroups tagged + tasty tasty-expected-failure tasty-hedgehog tasty-hunit + template-haskell text vector zippers + ]; + description = "JSON wrangling"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wacom-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, Glob, libnotify, process, select, text, udev diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 1ee0970ffad2..6892ea6364d7 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }: stdenv.mkDerivation rec { - name = "granite-${version}"; - version = "5.1.0"; + pname = "granite"; + version = "5.2.0"; + + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "elementary"; - repo = "granite"; + repo = pname; rev = version; sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; }; @@ -21,10 +23,10 @@ stdenv.mkDerivation rec { gettext gobjectIntrospection ninja - perl pkgconfig - vala_0_40 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged ]; + buildInputs = [ glib gnome3.libgee @@ -33,9 +35,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; - longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + longDescription = '' + Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions + designed for use in apps built for elementary OS. + ''; homepage = https://github.com/elementary/granite; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ vozz worldofpeace ]; }; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index a21e2aacde2a..e568ea9eb650 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; + NIX_CFLAGS_COMPILE = "-Wno-error=unknown-warning-option"; + enableParallelBuilds = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 71da2c716f84..a1df933149fd 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gssapi-impl=mit" ]; - doCheck = true; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch new file mode 100644 index 000000000000..b1f9d0978cec --- /dev/null +++ b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch @@ -0,0 +1,13 @@ +Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ +diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c +--- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 ++++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 +@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by + id3_ucs4_t *ucs4; + + end = *ptr + (length & ~1); ++ if (end == *ptr) ++ return 0; + + utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); + if (utf16 == 0) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 0289a5331f89..4b7d9bdc2e32 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib gperf ]; - patches = [ ./debian-patches.patch ]; + patches = [ + ./debian-patches.patch + ./CVE-2017-11550-and-CVE-2017-11551.patch + ]; preConfigure = '' configureFlagsArray+=( diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index afe30e4b5eef..ab9a696afb00 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "a C runtime library for AVR microcontrollers"; homepage = http://savannah.nongnu.org/projects/avr-libc/; license = licenses.bsd3; - platforms = platforms.all; + platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner ]; }; } diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 21230464e747..fbe48803f2db 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -32,6 +32,9 @@ in stdenv.mkDerivation rec { postPatch = '' sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + + substitutateInPlace Makefile \ + --replace "--specs=nano.specs" "" ''; enableParallelBuilding = true; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 9c35ac2ffce1..102b1eb8048d 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -26,6 +26,9 @@ in stdenv.mkDerivation rec { sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + + substitutateInPlace Makefile \ + --replace "--specs=nano.specs" "" ''; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 971aac70ad8e..700f5b3d0c52 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -3,12 +3,12 @@ , fetchPypi , pkgs , isPy3k +, python }: buildPythonPackage rec { pname = "bsddb3"; version = "6.2.6"; - disabled = isPy3k; src = fetchPypi { inherit pname version; @@ -17,8 +17,9 @@ buildPythonPackage rec { buildInputs = [ pkgs.db ]; - # Judging from SyntaxError in test - doCheck = false; # test suite breaks python3 compatibility + checkPhase = '' + ${python.interpreter} test.py + ''; # Path to database need to be set. # Somehow the setup.py flag is not propagated. diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f40c0fcb5592..428d6c60546e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -942,6 +942,10 @@ let PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz"; }); + ps = old.ps.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + rlang = old.rlang.overrideDerivation (attrs: { preConfigure = "patchShebangs configure"; }); diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix new file mode 100644 index 000000000000..d667e49e7cbe --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "timescaledb-parallel-copy-${version}"; + version = "2018-05-14"; + + owner = "timescale"; + repo = "timescaledb-parallel-copy"; + + goPackagePath = with src; "github.com/${owner}/${repo}"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit owner repo; + rev = "20d3e8f8219329f2f4b0a5aa985f280dd04d10bb"; + sha256 = "0waaccw991cnxaxjdxh9ksb94kiiyx1r7gif6pkd5k58js0kfvdn"; + }; + + meta = with stdenv.lib; { + description = "Bulk, parallel insert of CSV records into PostgreSQL"; + homepage = http://github.com/timescale/timescaledb-parallel-copy; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix new file mode 100644 index 000000000000..c672611e09c1 --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/jmoiron/sqlx"; + fetch = { + type = "git"; + url = "https://github.com/jmoiron/sqlx"; + rev = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849"; + sha256 = "0r8fyj70n0v84byvagw8w8rzz532s94mjr72b9sx018j0b6xglmy"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; + sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + }; + } +] diff --git a/pkgs/development/tools/jq/darwin-strptime-test.patch b/pkgs/development/tools/jq/darwin-strptime-test.patch deleted file mode 100644 index 4ea83fc164a3..000000000000 --- a/pkgs/development/tools/jq/darwin-strptime-test.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/jq.test b/tests/jq.test -index 4a4018b..f5aa7d5 100644 ---- a/src/tests/jq.test -+++ b/src/tests/jq.test -@@ -1144,9 +1144,9 @@ bsearch(4) - [1,2,3] - -4 - --[strptime("%Y-%m-%dT%H:%M:%SZ")|(.,mktime)] -+[strptime("%Y-%m-%dT%H:%M:%SZ")|mktime] - "2015-03-05T23:51:47Z" --[[2015,2,5,23,51,47,4,63],1425599507] -+[1425599507] - - strftime("%Y-%m-%dT%H:%M:%SZ") - [2015,2,5,23,51,47,4,63] diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 712ec64bd416..b7b2b5066b9f 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -2,33 +2,17 @@ stdenv.mkDerivation rec { name = "jq-${version}"; - version="1.5"; + version="1.6"; src = fetchurl { url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"; + sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn"; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; buildInputs = [ oniguruma ]; - patches = [ - (fetchpatch { - name = "CVE-2015-8863.patch"; - url = https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd.diff; - sha256 = "18bjanzvklfzlzzd690y88725l7iwl4f6wnr429na5pfmircbpvh"; - }) - (fetchpatch { - name = "CVE-2016-4074.patch"; - url = https://patch-diff.githubusercontent.com/raw/stedolan/jq/pull/1214.diff; - sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9"; - }) - ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-strptime-test.patch; - - patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released - configureFlags = [ "--bindir=\${bin}/bin" diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 99e53610c01c..382e733cb98b 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -1,9 +1,15 @@ { stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript -, dune, python3, rsync, fetchpatch }: +, dune, python3, rsync, fetchpatch, buck }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - pyre-version = "0.0.14"; + pyre-version = "0.0.17"; # also change typeshed revision below with $pyre-src/.typeshed-version + pyre-src = fetchFromGitHub { + owner = "facebook"; + repo = "pyre-check"; + rev = "v${pyre-version}"; + sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis"; + }; versionFile = writeScript "version.ml" '' cat > "./version.ml" <<EOF open Core @@ -20,12 +26,7 @@ let pyre-bin = stdenv.mkDerivation { name = "pyre-${pyre-version}"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "pyre-check"; - rev = "v${pyre-version}"; - sha256 = "0c8xzaa3ljqb6llr041sydw0l4xqn7x21nw9vaymdxh35nx9bp2v"; - }; + src = pyre-src; nativeBuildInputs = [ makeWrapper ]; @@ -49,7 +50,6 @@ let export HOME=. # "external" because https://github.com/facebook/pyre-check/pull/8/files - cp Makefile.template Makefile sed "s/%VERSION%/external/" dune.in > dune cp ${versionFile} ./scripts/generate-version-number.sh @@ -77,20 +77,18 @@ let description = "A performant type-checker for Python 3"; homepage = https://pyre-check.org; license = licenses.mit; - platforms = with platforms; linux; + platforms = ocamlPackages.ocaml.meta.platforms; maintainers = with maintainers; [ teh ]; }; }; typeshed = stdenv.mkDerivation { name = "typeshed"; - # typeshed doesn't have versions, it seems to be synchronized with - # mypy relases. I'm assigning a random version here (same as pyre). version = pyre-version; src = fetchFromGitHub { owner = "python"; repo = "typeshed"; - rev = "a08c6ea"; - sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk"; + rev = "bc3f9fe1d3c43b00c04cedb23e0eeebc9e1734b6"; + sha256 = "06b2kj4n49h4sgi8hn5kalmir8llhanfdc7f1924cxvrkj5ry94b"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = "cp -r $src $out"; @@ -98,19 +96,8 @@ typeshed = stdenv.mkDerivation { in python3.pkgs.buildPythonApplication rec { pname = "pyre-check"; version = pyre-version; - src = fetchFromGitHub { - owner = "facebook"; - repo = "pyre-check"; - rev = "v${pyre-version}"; - sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l"; - }; - patches = [ - (fetchpatch { - url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch"; - sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy"; - }) - ./pyre-bdist-wheel.patch - ]; + src = pyre-src; + patches = [ ./pyre-bdist-wheel.patch ]; # The build-pypi-package script does some funky stuff with build # directories - easier to patch it a bit than to replace it @@ -119,15 +106,21 @@ in python3.pkgs.buildPythonApplication rec { mkdir ./build substituteInPlace scripts/build-pypi-package.sh \ --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ - --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build" + --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build" + substituteInPlace client/buck.py \ + --replace '"buck"' '"${buck}/bin/buck"' + substituteInPlace client/tests/buck_test.py \ + --replace '"buck"' '"${buck}/bin/buck"' ''; - buildInputs = [ pyre-bin rsync ]; + buildInputs = [ pyre-bin ]; + nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ]; buildPhase = '' bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed} cp -r build/dist dist ''; - - doCheck = false; # can't open file 'nix_run_setup': + checkPhase = '' + bash scripts/run-python-tests.sh + ''; } diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index ca793bf49080..246f5b18843c 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "cargo-asm-${version}"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # Test checks against machine code output, which fails with some # LLVM/compiler versions. doCheck = false; |