diff options
Diffstat (limited to 'pkgs/development')
72 files changed, 976 insertions, 537 deletions
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 1efa100e61df5..7b23d4f6bcc17 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.10"; + version = "1.73.11"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "1lk8vlr0vg7h8lhiav99paa5a1mi0r2m8agxjmczhhavqhx44c32"; + sha256 = "1zhbs72qc8bw5158zh6mvzznfamcx5a1bsmbmq9ci0d7wb58sxmg"; }; installPhase = '' diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index cb5cf2c18a55d..87c798c8d382e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.30"; + version = "1.3.31"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1v5x64srafg7j3d31qhwhxv4hm2vg8vlbfncri3s5h3y6lcj4p1x"; + sha256 = "0sldhjxh2ghzwkabgziyiq4609iws0vninr8zxclzbqmcgajawqh"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index de7e3bd6a07e1..1c8e9fb7eb205 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -33,13 +33,13 @@ let }; in stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.5.0"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr"; + sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index fbf85ef804260..dc6866e3af3d4 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -8,8 +8,8 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.8.0"; - sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka"; + rev = "v0.9.1"; + sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj"; }; baked_file_system = { owner = "schovi"; @@ -23,23 +23,23 @@ rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63"; sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp"; }; - duktape = { - owner = "jessedoyle"; - repo = "duktape.cr"; - rev = "v0.14.1"; - sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1"; + dotenv = { + owner = "gdotdesign"; + repo = "cr-dotenv"; + rev = "v0.2.0"; + sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7"; }; exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.1"; - sha256 = "0pimjm64p21cjhp0jhcgdmbgisx7amk8hhbkcprkbr44bj6rv9ay"; + rev = "v0.1.2"; + sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.24.0"; - sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k"; + rev = "v0.25.1"; + sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782"; }; kilt = { owner = "jeromegn"; @@ -50,8 +50,8 @@ radix = { owner = "luislavena"; repo = "radix"; - rev = "v0.3.8"; - sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva"; + rev = "v0.3.9"; + sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix"; }; string_inflection = { owner = "mosop"; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index ddfd5d0a3fdfb..a498eafd4254d 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.2"; - sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; + rev = "Release-1.10.4"; + sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 783edb599f761..4aa21ca04d55a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -871,38 +871,17 @@ self: super: { # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; - # fix GHC 8.6 builds by using irrefutable patterns. jailbreak is also - # required due to a constraint failure for base-compat. - cryptol = doJailbreak (overrideCabal super.cryptol (drv: { - - # the last patch fixes ghc 8.6 builds; the other two (small) patches fix a - # few bugs between them, but are also hard dependencies - patches = drv.patches or [] ++ [ - (pkgs.fetchpatch { - url = https://github.com/GaloisInc/cryptol/commit/634c5a03e757663bf86d1ffad1ce2c6086d4483f.patch; - sha256 = "16dvfihsl2c4jnyfndgrjarkm3z5pyn7rzg2svnidx0qipwrxzm7"; - }) - (pkgs.fetchpatch { - url = https://github.com/GaloisInc/cryptol/commit/515642328aff6d958ff1b534b9effdd726901b60.patch; - sha256 = "1fml71b720igyh8s7mj1z1c2bbv1vk490iy7blvxp625nymzjij6"; - }) - (pkgs.fetchpatch { - url = https://github.com/GaloisInc/cryptol/commit/a8eab11b319f6434f9b01b26d419b8305ff30bc2.patch; - sha256 = "1bbznp3kbj8l83q979gf4gr2khwbyqi85ykwsf2jnkhzda6pr0n8"; - }) - ]; - + # Wrap the generated binaries to include their run-time dependencies in + # $PATH. Also, cryptol needs a version of sbl that's newer than what we have + # in LTS-13.x. + cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; - - # make sure the binaries always start up. previously this was in - # all-packages.nix but it's almost certainly better to do it here (e.g. a - # haskell deps may use cryptol in the test suite or something, etc) postInstall = drv.postInstall or "" + '' for b in $out/bin/cryptol $out/bin/cryptol-html; do wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin" done ''; - })); + }); # Tests try to invoke external process and process == 1.4 grakn = dontCheck (doJailbreak super.grakn); @@ -1223,15 +1202,10 @@ self: super: { sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4"; }); - # These patches contain fixes for 8.6 that should be safe for - # earlier versions, but we need the relaxed version bounds in GHC - # 8.4 builds. beam needs to release a round of updates that relax - # bounds and include the 8.6 fixes: - # https://github.com/tathougies/beam/issues/315 - beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch; - beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; - beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; - beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; + # Requires pg_ctl command during tests + beam-postgres = overrideCabal super.beam-postgres (drv: { + testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; + }); # https://github.com/sighingnow/computations/pull/1 primesieve = appendPatch super.primesieve (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0795ca0f7238a..5952cbd16c2bb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3014,12 +3014,7 @@ broken-packages: - bdcs - bdcs-api - beam - - beam-core - - beam-migrate - - beam-mysql - beam-newtype-field - - beam-postgres - - beam-sqlite - beam-th - beamable - beautifHOL @@ -8049,6 +8044,7 @@ broken-packages: - reflex-backend-wai - reflex-basic-host - reflex-dom-core + - reflex-dom-svg - reflex-gloss - reflex-gloss-scene - reflex-orphans @@ -9947,6 +9943,7 @@ broken-packages: - yesod-markdown - yesod-paginate - yesod-pagination + - yesod-paginator - yesod-paypal-rest - yesod-platform - yesod-pnotify diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e13edb352684e..97ac7757e8a4d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21193,8 +21193,8 @@ self: { }: mkDerivation { pname = "accelerate-blas"; - version = "0.2.0.0"; - sha256 = "0y77wsdw0i7b5bzlfrrn9q4d8q95r8z71g8qy77n24db1pwmjqy9"; + version = "0.2.0.1"; + sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21289,18 +21289,18 @@ self: { ({ mkDerivation, accelerate, accelerate-fft, accelerate-io , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base , binary, bmp, bytestring, bytestring-lexing, cereal - , colour-accelerate, containers, criterion, directory, fclabels - , filepath, gloss, gloss-accelerate, gloss-raster-accelerate - , gloss-rendering, HUnit, lens-accelerate, linear - , linear-accelerate, matrix-market-attoparsec, mwc-random + , colour-accelerate, containers, criterion, criterion-measurement + , directory, fclabels, filepath, gloss, gloss-accelerate + , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate + , linear, linear-accelerate, matrix-market-attoparsec, mwc-random , normaldistribution, QuickCheck, random, repa, repa-io, scientific , test-framework, test-framework-hunit, test-framework-quickcheck2 , vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.2.0.0"; - sha256 = "1gb4m1ri461f78x913ipxh14ybwl9wzbv81w8943whiwrmb3p5pc"; + version = "1.2.0.1"; + sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; @@ -21313,10 +21313,10 @@ self: { executableHaskellDepends = [ accelerate accelerate-fft accelerate-io base binary bmp bytestring bytestring-lexing cereal colour-accelerate containers criterion - directory fclabels filepath gloss gloss-accelerate - gloss-raster-accelerate gloss-rendering lens-accelerate - linear-accelerate matrix-market-attoparsec mwc-random - normaldistribution random repa repa-io scientific vector + criterion-measurement directory fclabels filepath gloss + gloss-accelerate gloss-raster-accelerate gloss-rendering + lens-accelerate linear-accelerate matrix-market-attoparsec + mwc-random normaldistribution random repa repa-io scientific vector vector-algorithms ]; description = "Examples using the Accelerate library"; @@ -23080,6 +23080,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-diff_1_1_0_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, doctest + , edit-distance-vector, filepath, Glob, hashable, mtl + , optparse-applicative, QuickCheck, quickcheck-instances + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-diff"; + version = "1.1.0.7"; + sha256 = "01d48pd7d1mb9cd5yxfajln8rmjdjq8ch91s0lav4qw1azv6vp2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring edit-distance-vector hashable mtl scientific + text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest filepath Glob QuickCheck + quickcheck-instances text unordered-containers vector + ]; + description = "Extract and apply patches to JSON documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-diff-generic" = callPackage ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring , containers, dlist, hashable, lens, scientific, tagged @@ -24296,6 +24324,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alarmclock_0_7_0_1" = callPackage + ({ mkDerivation, async, base, clock, hspec, stm, time + , unbounded-delays + }: + mkDerivation { + pname = "alarmclock"; + version = "0.7.0.1"; + sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; + libraryHaskellDepends = [ + async base clock stm time unbounded-delays + ]; + testHaskellDepends = [ + async base clock hspec stm time unbounded-delays + ]; + description = "Wake up and perform an action at a certain time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alea" = callPackage ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { @@ -33311,8 +33358,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "29"; - editedCabalFile = "07vc32yn5d954higzxg3c94l3wzgc38b7y2xq8c5rkxwqz8xf97s"; + revision = "30"; + editedCabalFile = "0z7awvdz7447gjgg98z8682d7q1gqn85qcm0dsdgrhv67rkfnadz"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -36011,8 +36058,6 @@ self: { ]; description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-migrate" = callPackage @@ -36033,8 +36078,6 @@ self: { ]; description = "SQL DDL support and migrations support library for Beam"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-mysql" = callPackage @@ -36052,8 +36095,6 @@ self: { ]; description = "Connection layer between beam and MySQL/MariaDB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-newtype-field" = callPackage @@ -36097,8 +36138,6 @@ self: { ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-sqlite" = callPackage @@ -36116,8 +36155,6 @@ self: { ]; description = "Beam driver for SQLite"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-th" = callPackage @@ -37957,8 +37994,8 @@ self: { ({ mkDerivation, base, bindings-DSL }: mkDerivation { pname = "bindings-hdf5"; - version = "0.1"; - sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79"; + version = "0.1.2"; + sha256 = "1d94irqliswjqx65k147mj8i9j34xhfn5lyk5xa7ycf3m5b1g95z"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Project bindings-* raw interface to HDF5 library"; license = stdenv.lib.licenses.bsd3; @@ -43150,6 +43187,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byteslice" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "byteslice"; + version = "0.1.0.0"; + sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg"; + libraryHaskellDepends = [ base primitive ]; + description = "Slicing ByteArray and MutableByteArray"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring_0_10_8_2" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random @@ -45126,6 +45174,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cache_0_1_1_2" = callPackage + ({ mkDerivation, base, clock, hashable, hspec, stm, transformers + , unordered-containers + }: + mkDerivation { + pname = "cache"; + version = "0.1.1.2"; + sha256 = "0b0jggcbnrs0pppn60kaggxkwmg0ri7b1i4j5613abgw8bj258s8"; + libraryHaskellDepends = [ + base clock hashable stm transformers unordered-containers + ]; + testHaskellDepends = [ base clock hspec stm transformers ]; + description = "An in-memory key/value store with expiration support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cached" = callPackage ({ mkDerivation, base, containers, directory, doctest, filepath , protolude, QuickCheck, quickcheck-assertions, shake, text @@ -49106,10 +49171,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.4"; - sha256 = "1v9v237473d3fg45sqhx1ksmgvy7p144jdw0a4bvlma01fbzk09h"; - revision = "1"; - editedCabalFile = "0796ic47hmzard8bmgnj0kww32afp8lppx3l5c85nafk7dasykyn"; + version = "1.0.5"; + sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -49120,7 +49183,7 @@ self: { ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion deepseq old-locale QuickCheck - thyme time vector + text thyme time vector ]; description = "A performant time library"; license = stdenv.lib.licenses.bsd3; @@ -53101,12 +53164,17 @@ self: { }) {}; "comic" = callPackage - ({ mkDerivation, aeson, base, text }: + ({ mkDerivation, aeson, base, deepseq, hashable, hashable-orphans + , lens, sorted-list, text, time, uuid + }: mkDerivation { pname = "comic"; - version = "0"; - sha256 = "00y23pd6pp4siggs0wkf102phi961dyfffbj5wjsvmhlg2nv5hg3"; - libraryHaskellDepends = [ aeson base text ]; + version = "0.0.1"; + sha256 = "1hr2dwj9d3wlwdalcr51jjvlk8lg92lhds25vxvjszpxf6nch20k"; + libraryHaskellDepends = [ + aeson base deepseq hashable hashable-orphans lens sorted-list text + time uuid + ]; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56079,8 +56147,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.1.0"; - sha256 = "0jsqm1d8341i98vg98l01sg0vhw398z1x3lf68kz380qiy7paz4c"; + version = "1.0.1.1"; + sha256 = "08dggdvl4qgx376vh037ss2blha4x7qmf0xh0fjx4m4ljabg3k4f"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -59543,26 +59611,24 @@ self: { "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, base-compat - , blaze-html, bytestring, containers, criterion, deepseq, directory - , filepath, gitrev, GraphSCC, happy, haskeline, heredoc - , monad-control, monadLib, mtl, panic, pretty, process, random, sbv - , simple-smt, strict, text, tf-random, time, transformers - , transformers-base + , blaze-html, bytestring, containers, criterion, cryptohash-sha1 + , deepseq, directory, filepath, gitrev, GraphSCC, happy, haskeline + , heredoc, monad-control, monadLib, mtl, panic, pretty, process + , random, sbv, simple-smt, strict, text, tf-random, time + , transformers, transformers-base }: mkDerivation { pname = "cryptol"; - version = "2.6.0"; - sha256 = "0hlgff177s8lhv3s90cmqc3x2xr60g3vxvc7p1mhzb354zxbp2jz"; - revision = "1"; - editedCabalFile = "1smkc0gxbj1vl626iiy56aarx6rcnjzqprqzh443222samrrzr25"; + version = "2.7.0"; + sha256 = "14yk7qs7laxy5ranx9m911k1lxc4vh4pp83ywmsg1kf0cdfvmij6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base base-compat bytestring containers deepseq directory - filepath gitrev GraphSCC heredoc monad-control monadLib mtl panic - pretty process random sbv simple-smt strict text tf-random time - transformers-base + array base base-compat bytestring containers cryptohash-sha1 + deepseq directory filepath gitrev GraphSCC heredoc monad-control + monadLib mtl panic pretty process random sbv simple-smt strict text + tf-random time transformers-base ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -60804,8 +60870,8 @@ self: { }: mkDerivation { pname = "cyclotomic"; - version = "0.5.1"; - sha256 = "1zazdzsiv42p244f0js2fj81l6wkv0s46rfcl9hyabzcq6x9h87p"; + version = "1.0"; + sha256 = "15mp9wi83anv1vxc6649agak4zn4fqyh2vik5f983269h4xsv12j"; libraryHaskellDepends = [ arithmoi base containers ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -62396,8 +62462,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; - revision = "2"; - editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s"; + revision = "3"; + editedCabalFile = "0jfqgijikf11lqsvbj0rc2b9n2ym7gn4mhk5xpsginp0vy3bgpbp"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -74771,16 +74837,16 @@ self: { , directory, exceptions, monad-loops, process, QuickCheck , quickcheck-instances, quickcheck-properties, quickcheck-text , random, retry, SafeSemaphore, semigroups, stm, text, time - , transformers, transformers-either + , transformers, transformers-either, unordered-containers }: mkDerivation { pname = "entwine"; - version = "0.0.3"; - sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij"; + version = "0.0.4"; + sha256 = "1k150jbn2jb4ckadmcb655x7ck1cw659zkv03ngwp0wmx8l51n6b"; libraryHaskellDepends = [ async base clock containers exceptions monad-loops retry SafeSemaphore semigroups stm text time transformers - transformers-either + transformers-either unordered-containers ]; testHaskellDepends = [ async base directory exceptions process QuickCheck @@ -76002,7 +76068,7 @@ self: { broken = true; }) {}; - "esqueleto_2_7_0" = callPackage + "esqueleto_3_0_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers , hspec, monad-logger, mysql, mysql-simple, persistent , persistent-mysql, persistent-postgresql, persistent-sqlite @@ -76012,8 +76078,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.7.0"; - sha256 = "1cxf26qfymsx578yzpmpdhs7w79s3xw5ar8d359cxbk04j0im2ib"; + version = "3.0.0"; + sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text time transformers unliftio @@ -76797,8 +76863,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.7"; - sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w"; + version = "0.8.2.8"; + sha256 = "1k10f8mihxb9xsvjkmzxphin4l49f5pwbfxfan1ar7wzxyv85vjj"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -77920,8 +77986,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.4.2"; - sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5"; + version = "0.5"; + sha256 = "1xp6rfiak6a8mg20xjdimcqna1g99a7gafgzrvpala3i06wjb3ia"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -77939,8 +78005,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.4"; - sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv"; + version = "0.5"; + sha256 = "1l9h88hvbnl0y8yz5drzn2smnll3wsk6ni4qn752m51g9hm4qvjf"; libraryHaskellDepends = [ base containers expressions list-t singletons transformers z3 ]; @@ -78788,8 +78854,8 @@ self: { }: mkDerivation { pname = "fast-builder"; - version = "0.1.0.0"; - sha256 = "1sc5hgiagjcsblbzlymd9z140ybmq03l6xykksjdx0xkwj4sqrp2"; + version = "0.1.0.1"; + sha256 = "0ykl1s29kma3bxvv1jfi7q8yv9vmbn1lsrfyn7axgi51j4g06x32"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ @@ -79189,8 +79255,8 @@ self: { ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.21.1.0"; - sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z"; + version = "0.21.1.1"; + sha256 = "09fnivdghxc750gpsa3hr7vgj3hff21zj7k73dfkxbkaj48bpf7q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; @@ -80717,6 +80783,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "filelock_0_1_1_3" = callPackage + ({ mkDerivation, async, base, process, unix }: + mkDerivation { + pname = "filelock"; + version = "0.1.1.3"; + sha256 = "04qimhz78jjndk686dblkx06l9jscq2q9gyr014a4pbfj4iljgi5"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; + description = "Portable interface to file locking (flock / LockFileEx)"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filemanip" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , unix-compat @@ -83577,6 +83656,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "forma_1_1_2" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, mtl, text + , unordered-containers + }: + mkDerivation { + pname = "forma"; + version = "1.1.2"; + sha256 = "1ppgqwqm157ygj992r0cbarfii127g7nm63wbnrqvr9k1wmnlxx0"; + libraryHaskellDepends = [ + aeson base containers mtl text unordered-containers + ]; + testHaskellDepends = [ aeson base containers hspec mtl text ]; + description = "Parse and validate forms in JSON format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "formal" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers , directory, file-embed, HTTP, indents, interpolatedstring-perl6 @@ -87585,6 +87681,17 @@ self: { broken = true; }) {}; + "generic-env" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "generic-env"; + version = "0.1.1.0"; + sha256 = "084rfdmcw071dslnw86n2w58xiqhkaldf7qjcmlizykqc15si5xh"; + libraryHaskellDepends = [ base containers text ]; + description = "Generic Environment Generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, HUnit , inspection-testing, lens, profunctors, QuickCheck, tagged @@ -92673,8 +92780,8 @@ self: { }: mkDerivation { pname = "gitlib-test"; - version = "3.1.1"; - sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi"; + version = "3.1.2"; + sha256 = "17v84igqyhc808nzv2qsyylk9ls4kzfd9hdx1avj4vb4gc5gblzz"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators exceptions gitlib hspec hspec-expectations HUnit tagged text time transformers @@ -114533,8 +114640,8 @@ self: { }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.0.20190428"; - sha256 = "1a4lyysd63y9r3cg4vjn1zxwf3s6vrngl3d93l7pdabhvfpmdkjb"; + version = "0.0.0.20190501"; + sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894"; libraryHaskellDepends = [ base bytestring containers cryptonite memory mmorph random text transformers unordered-containers @@ -116169,6 +116276,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.8.5"; + sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -118277,8 +118404,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.7.1.0"; - sha256 = "0fxa92lvw61d48dbgk24bcx2kjbw8k8gpzbbi7z2d8k3z2b9alfk"; + version = "1.8.0.0"; + sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash data-default exceptions fields-json hpqtypes lifted-base log-base @@ -118468,8 +118595,8 @@ self: { }: mkDerivation { pname = "hpython"; - version = "0.2"; - sha256 = "1c9ryyfm3cdhl3n5vqhzsxi31jl0vg5qaq1n8li1cy843bjgl63a"; + version = "0.3"; + sha256 = "1vbjvx87n4d6fhvgz6hbbpyfh2276d3dlq0v39jq85qsb1274ip2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121164,14 +121291,16 @@ self: { }) {}; "hslua-module-system" = callPackage - ({ mkDerivation, base, directory, hslua, tasty, tasty-hunit - , temporary, text + ({ mkDerivation, base, containers, directory, exceptions, hslua + , tasty, tasty-hunit, temporary, text }: mkDerivation { pname = "hslua-module-system"; - version = "0.1.0.1"; - sha256 = "1qkp8pdnh8s7wh2yfpbfg1vbr7qpywa1gsz06chmwkyva0clx2cq"; - libraryHaskellDepends = [ base directory hslua temporary ]; + version = "0.2.0"; + sha256 = "1yjkq6af7x1vyqxszdlb6fysv8q97q3424gycvqhdqjd8wf545b5"; + libraryHaskellDepends = [ + base containers directory exceptions hslua temporary + ]; testHaskellDepends = [ base hslua tasty tasty-hunit text ]; description = "Lua module wrapper around Haskell's System module"; license = stdenv.lib.licenses.mit; @@ -124195,6 +124324,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_7_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.7.1"; + sha256 = "1xnjbwvil1an5crffcwapdqyinbvvss25rcdra05isqixcs26h39"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -131425,6 +131583,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "interpolator_0_1_2" = callPackage + ({ mkDerivation, aeson, base, containers, either, hspec + , mono-traversable, mtl, product-profunctors, profunctors + , QuickCheck, template-haskell, text + }: + mkDerivation { + pname = "interpolator"; + version = "0.1.2"; + sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz"; + libraryHaskellDepends = [ + aeson base containers either mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + aeson base containers either hspec mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + description = "Runtime interpolation of environment variables in records using profunctors"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "interprocess" = callPackage ({ mkDerivation, base, typed-process }: mkDerivation { @@ -138131,8 +138311,8 @@ self: { }: mkDerivation { pname = "knit-haskell"; - version = "0.1.0.0"; - sha256 = "11kqv2jxjn3maj53lgbccxcjcjrfqgsi8dd2ys51aalak2pf79bx"; + version = "0.2.0.0"; + sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138935,6 +139115,8 @@ self: { pname = "lambdabot-core"; version = "5.2"; sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss"; + revision = "1"; + editedCabalFile = "1srdkvyw1b0cpv2gq497x11zmqkiqpxkhhdhkd0363wayqjpg21s"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -146995,6 +147177,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logict_0_6_0_3" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "logict"; + version = "0.6.0.3"; + sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh"; + libraryHaskellDepends = [ base mtl ]; + description = "A backtracking logic-programming monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logict-state" = callPackage ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { @@ -150506,7 +150700,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_3_1_0" = callPackage + "massiv_0_3_2_0" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest , containers, data-default, data-default-class, deepseq, doctest , exceptions, hspec, primitive, QuickCheck, scheduler @@ -150514,8 +150708,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.3.1.0"; - sha256 = "0hjfnp8w3yk1kfx2avmfv3cbhrzyh89nw5zlm0r5fpgdx3gmkn6k"; + version = "0.3.2.0"; + sha256 = "0cap5rxy3d301ci1ysh4d0y3k4smgx6w4s7ngqkzdbw17fk74iam"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -151920,6 +152114,51 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_7_0_5" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "7.0.5"; + sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "megaparsec-tests" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "7.0.5"; + sha256 = "11kwf122bq38qvkpvhb1pkqzbv7yk9wi7klmg9yvls29x66shiyq"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153107,6 +153346,8 @@ self: { pname = "microlens-th"; version = "0.4.2.3"; sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j"; + revision = "1"; + editedCabalFile = "167in7b1qhgrspx81bdm2jyg9qji66sk7id282c0s99kmp0d01n6"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -155776,8 +156017,8 @@ self: { }: mkDerivation { pname = "monad-metrics"; - version = "0.2.1.2"; - sha256 = "0zxvdx75psdninvh7f7wqj498wav2cjmn94n5a3f5g8nvrs0n4rq"; + version = "0.2.1.3"; + sha256 = "0ryazqrn7s2pzgzgvzp4paibylbvl54p52gc70n3alwzz8x1b7bd"; libraryHaskellDepends = [ base clock ekg-core exceptions hashable microlens mtl text transformers unordered-containers @@ -158447,8 +158688,8 @@ self: { }: mkDerivation { pname = "multi-containers"; - version = "0.1.0.0"; - sha256 = "1ig4i2jbkmap3iy8kdqwfr3n3jx30dy66x9lq03nlkxxpi0p1y93"; + version = "0.1.0.2"; + sha256 = "1az9drnj6kd6x8r8gycfndqw9mhv0arvi4mkmqcazjg3lr7rxvpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -158456,7 +158697,7 @@ self: { base containers directory extra filepath ]; testHaskellDepends = [ base containers hspec ]; - description = "A few variants of multimaps"; + description = "A few multimap variants"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -162224,8 +162465,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; - revision = "1"; - editedCabalFile = "0j5dpk1b5qx2rl8w9awrw5ghi8i7fm7zhkdhakcqaqrx8m1yraar"; + revision = "2"; + editedCabalFile = "1cqb720gl960zfzbzxakc2wvrvw8plncgarbb1v1hdzmdxw07js7"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; @@ -173488,6 +173729,28 @@ self: { broken = true; }) {}; + "persistent-documentation" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, mtl + , persistent, persistent-template, template-haskell, text + }: + mkDerivation { + pname = "persistent-documentation"; + version = "0.1.0.0"; + sha256 = "1m9hmvi6krksb64k5mqkqpcz3670xjbqr4vic0x1n350ji2mrngd"; + revision = "1"; + editedCabalFile = "06nrr2c4pprrgl4d2iwi8np7714rx685g4dagaad79q5x01k4d8v"; + libraryHaskellDepends = [ + base containers mtl persistent template-haskell text + ]; + testHaskellDepends = [ + base containers hspec hspec-discover persistent persistent-template + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Documentation DSL for persistent entities"; + license = stdenv.lib.licenses.asl20; + }) {}; + "persistent-equivalence" = callPackage ({ mkDerivation, array, base, diffarray }: mkDerivation { @@ -173727,6 +173990,8 @@ self: { pname = "persistent-postgresql"; version = "2.9.1"; sha256 = "02i5lq6j79cv1y6n7c3lzipngkwaqfa96i4nvnkrs535x9xbxlpq"; + revision = "1"; + editedCabalFile = "186fbykla4hpsl14l1ccjr3rfdabl47c9x28m290477ilaygk685"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -174001,8 +174266,8 @@ self: { pname = "persistent-template"; version = "2.5.4"; sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; - revision = "3"; - editedCabalFile = "12f4pqxwfv2li78sd9s56p66xd0w465cmjycpkqvg8n1rjxkc8vs"; + revision = "4"; + editedCabalFile = "08yb4kcmpqmm50lwrbmavd0zhgg6p7bl8dy026xw644cazrzcvr1"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -174114,8 +174379,8 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.0.1.1"; - sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n"; + version = "0.1.0.0"; + sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent persistent-template resource-pool resourcet @@ -183998,8 +184263,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.1.0.0"; - sha256 = "01r6pzv0c49lk2z68jz6z9fppdhdjyg7igl6ji44w1rmgpiaircj"; + version = "0.1.0.1"; + sha256 = "0igjid6rfg13bhgkm51np0ml2sfnkg5a6z3231mmiynkdja7l5zl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186876,6 +187141,8 @@ self: { pname = "ralist"; version = "0.2.1.1"; sha256 = "0fy8c36ygdn609nq6wasc685y3z7g188nkhym7bpb7rigi1si7xj"; + revision = "1"; + editedCabalFile = "187idyc9b2q476xxxnpgglf818vp701ww0ir5j4dn96g0qwni8xb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -190101,6 +190368,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-svg" = callPackage + ({ mkDerivation, base, containers, lens, reflex, reflex-dom-core + , safe, text + }: + mkDerivation { + pname = "reflex-dom-svg"; + version = "0.3.2.0"; + sha256 = "0xmhccim3n6qk1dj4qyf6rhaygrpb2wzhl00rwm74cqw7ljrf5y9"; + libraryHaskellDepends = [ + base containers lens reflex reflex-dom-core safe text + ]; + description = "Reflex functions for SVG elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-gloss" = callPackage ({ mkDerivation, base, dependent-sum, gloss, mtl, reflex , transformers @@ -192170,6 +192454,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_2_1_0" = callPackage + ({ mkDerivation, base, containers, fail, haskeline, mtl, process }: + mkDerivation { + pname = "repline"; + version = "0.2.1.0"; + sha256 = "0yxfn6p4gprnv8hzpzh7872fs3l661d587v4kkp51mjyydpiihs5"; + libraryHaskellDepends = [ + base containers fail haskeline mtl process + ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -193260,15 +193558,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "retry_0_8_0_0" = callPackage + "retry_0_8_0_1" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers }: mkDerivation { pname = "retry"; - version = "0.8.0.0"; - sha256 = "0m44firqn9bkspj2jjf88kksf7mjmbi00xz0855lnflc8b3377cf"; + version = "0.8.0.1"; + sha256 = "0x63grjv0r96gv8ksh6r6aja6fvnwr06bypigvkskzhjjbk3fhcx"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -199960,16 +200258,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_3_1_2" = callPackage + "semirings_0_4" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp - , unordered-containers, vector + , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.3.1.2"; - sha256 = "1zh5fgm1xidd03c00wh9llscx529qd1n6cnpv7k172xp4rd2w261"; + version = "0.4"; + sha256 = "0p5crw2n47nx76y9zsx3bpjb619wsi8p91wjq4pcw29jw6idvid0"; libraryHaskellDepends = [ - base containers hashable integer-gmp unordered-containers vector + base containers hashable integer-gmp unordered-containers ]; description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; @@ -204163,8 +204461,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.8"; - sha256 = "18j9xhl7h3sc6jswac4dz78i4rq7004150b98kq49w20flpidr5d"; + version = "0.17.9"; + sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206392,6 +206690,8 @@ self: { pname = "simple-sendfile"; version = "0.2.28"; sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059"; + revision = "2"; + editedCabalFile = "16pyj7b4i1dzpzqbarzjamcjdyiy8j6lh5vf1ggchx69x44dqcr3"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -214943,10 +215243,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "stm-lifted"; - version = "0.1.1.0"; - sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c"; - revision = "1"; - editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255"; + version = "2.5.0.0"; + sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658"; libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; @@ -215185,6 +215483,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stopwatch_0_1_0_6" = callPackage + ({ mkDerivation, base, clock, hspec, transformers }: + mkDerivation { + pname = "stopwatch"; + version = "0.1.0.6"; + sha256 = "1gvlh58hkg02a5814lm5f123p853z92dlmv4r5mhhlg5j6g7c62h"; + libraryHaskellDepends = [ base clock transformers ]; + testHaskellDepends = [ base clock hspec ]; + description = "A simple stopwatch utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storable" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -218275,6 +218586,8 @@ self: { pname = "sv"; version = "1.3.1"; sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k"; + revision = "1"; + editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -218302,8 +218615,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; - revision = "1"; - editedCabalFile = "01xfdl296jcdh7c4yirzf6z0787z941h6p58dn5xhnsr965sncg1"; + revision = "2"; + editedCabalFile = "14grn815r54480jqpfib6qi3ivbaw0asa5ys0rp93allsprk96xb"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -218351,6 +218664,8 @@ self: { pname = "sv-core"; version = "0.4.1"; sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; + revision = "1"; + editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -220800,6 +221115,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_8" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.8"; + sha256 = "1m9sx6gr9y9yxvkmcap8xsks8cnhznvma1mrfl39zljkv005azms"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -225473,6 +225805,19 @@ self: { broken = true; }) {}; + "th-env" = callPackage + ({ mkDerivation, base, markdown-unlit, template-haskell }: + mkDerivation { + pname = "th-env"; + version = "0.1.0.0"; + sha256 = "19br06iq4cmnyk7s23s08yq6v2llzi9zq26yi2pigk6spwb4pyjn"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base markdown-unlit ]; + testToolDepends = [ markdown-unlit ]; + description = "Template Haskell splice that expands to an environment variable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-expand-syns" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { @@ -225652,41 +225997,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "th-lift-instances_0_1_11" = callPackage + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, th-lift, vector + , template-haskell, text, vector }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.11"; - sha256 = "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x"; + version = "0.1.12"; + sha256 = "1kjfwfmkn7r35qlsa0n4la3103jlfbjf3ia1pvsgizgrwxr1zjid"; libraryHaskellDepends = [ - base bytestring containers template-haskell text th-lift vector + base bytestring containers template-haskell text vector ]; testHaskellDepends = [ base bytestring containers QuickCheck template-haskell text vector ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "th-lift-instances" = callPackage + "th-lift-instances_0_1_13" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, vector + , template-haskell, text, th-lift, transformers, vector }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.12"; - sha256 = "1kjfwfmkn7r35qlsa0n4la3103jlfbjf3ia1pvsgizgrwxr1zjid"; + version = "0.1.13"; + sha256 = "0zmhz593lfgi194ps8cv592j0wyc37mdn9pf2pchmr7h8bkmbksf"; libraryHaskellDepends = [ - base bytestring containers template-haskell text vector + base bytestring containers template-haskell text th-lift + transformers vector ]; testHaskellDepends = [ base bytestring containers QuickCheck template-haskell text vector ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-nowq" = callPackage @@ -231326,6 +231672,8 @@ self: { pname = "turtle"; version = "1.5.14"; sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z"; + revision = "1"; + editedCabalFile = "0jfa861ch7cibalcqszywjiyqa95xs7k1dqjjkqqx6fih9y13n0l"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -235207,8 +235555,8 @@ self: { pname = "unliftio-core"; version = "0.1.2.0"; sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4"; - revision = "1"; - editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29"; + revision = "2"; + editedCabalFile = "0jqrjjbgicx48wzcjxs1xmih48ay79rhmrz6081dldlfxynli6vz"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; @@ -237309,6 +237657,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_1_1" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups + }: + mkDerivation { + pname = "validation"; + version = "1.1"; + sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; + libraryHaskellDepends = [ + base bifunctors deepseq lens semigroupoids semigroups + ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -237680,8 +238045,8 @@ self: { }: mkDerivation { pname = "vault-tool"; - version = "0.1.0.0"; - sha256 = "00hnbd34chi7nm8vwq80vhl0629gklfkyfwic80q7i17kzsdvx90"; + version = "0.1.0.1"; + sha256 = "13bxbzamd3mca5bngmzn82fzk66b4vp5crw33bzg01nmbprxfcbb"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types text unordered-containers @@ -237698,8 +238063,8 @@ self: { }: mkDerivation { pname = "vault-tool-server"; - version = "0.1.0.0"; - sha256 = "06h4cslkb54p3yydcnkzlzysn54cy801i5fwc02hc4gi3kvia84k"; + version = "0.1.0.1"; + sha256 = "0svgjr2qxsiwx5i0lrwzfcmaikgavls8vc9p0wcj3w1ndrbjk1y5"; libraryHaskellDepends = [ aeson async base bytestring filepath http-client process temporary text vault-tool @@ -238023,6 +238388,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector_0_12_0_3" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit + , primitive, QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.12.0.3"; + sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq"; + revision = "1"; + editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base base-orphans HUnit primitive QuickCheck random + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + description = "Efficient Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector @@ -240107,6 +240494,8 @@ self: { pname = "wai-extra"; version = "3.0.26"; sha256 = "1vax87kchm92az0f4axn793bavp8pwjh7a9mc1lwwwni678h35gq"; + revision = "1"; + editedCabalFile = "02475xywcp12xysa6l2p6ibx800978lsa6rkgx9gnhans7z6yj16"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250480,6 +250869,8 @@ self: { ]; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-paypal-rest" = callPackage @@ -251075,6 +251466,8 @@ self: { pname = "yesod-test"; version = "1.5.9.1"; sha256 = "05l5n28azbh6r1vsi7xvz1h19if5zrwn1b3jsr2913axfs3d9r3y"; + revision = "1"; + editedCabalFile = "1s3rfrk122ag4j0jzmym8nj6iql5jxv6ilsf0671f63824x3kgas"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit diff --git a/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch deleted file mode 100644 index e5ad00ee009fa..0000000000000 --- a/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/beam-core/Database/Beam/Backend/SQL.hs b/beam-core/Database/Beam/Backend/SQL.hs -index e2cd37d0..6f9db126 100644 ---- a/Database/Beam/Backend/SQL.hs -+++ b/Database/Beam/Backend/SQL.hs -@@ -10,6 +10,7 @@ - import Database.Beam.Backend.Types - - import Control.Monad.IO.Class -+import Control.Monad.Fail (MonadFail) - - -- * MonadBeam class - -@@ -29,7 +30,7 @@ - -- strategies. More complicated strategies (for example, Postgres's @COPY@) - -- are supported in individual backends. See the documentation of those - -- backends for more details. --class (BeamBackend be, Monad m, MonadIO m, Sql92SanityCheck syntax) => -+class (BeamBackend be, Monad m, MonadIO m, MonadFail m, Sql92SanityCheck syntax) => - MonadBeam syntax be handle m | m -> syntax be handle where - - {-# MINIMAL withDatabaseDebug, runReturningMany #-} -diff --git a/Database/Beam/Backend/SQL/Builder.hs b/Database/Beam/Backend/SQL/Builder.hs -index 9e734036..e9849912 100644 ---- a/Database/Beam/Backend/SQL/Builder.hs -+++ b/Database/Beam/Backend/SQL/Builder.hs -@@ -33,6 +33,7 @@ - import Data.Hashable - import Data.Int - import Data.String -+import qualified Control.Monad.Fail as Fail - #if !MIN_VERSION_base(4, 11, 0) - import Data.Semigroup - #endif -@@ -507,8 +508,10 @@ - type BackendFromField SqlSyntaxBackend = Trivial - - newtype SqlSyntaxM a = SqlSyntaxM (IO a) -- deriving (Applicative, Functor, Monad, MonadIO) -+ deriving (Applicative, Functor, Monad, MonadIO, Fail.MonadFail) - - instance MonadBeam SqlSyntaxBuilder SqlSyntaxBackend SqlSyntaxBackend SqlSyntaxM where -- withDatabaseDebug _ _ _ = fail "absurd" -- runReturningMany _ _ = fail "absurd" -+ withDatabaseDebug _ _ _ = Fail.fail "absurd" -+ runReturningMany _ _ = Fail.fail "absurd" -+ -+ -diff --git a/Database/Beam/Schema/Lenses.hs b/Database/Beam/Schema/Lenses.hs -index b21dddb6..5df0654c 100644 ---- a/Database/Beam/Schema/Lenses.hs -+++ b/Database/Beam/Schema/Lenses.hs -@@ -1,4 +1,5 @@ - {-# LANGUAGE PolyKinds #-} -+{-# LANGUAGE UndecidableInstances #-} - module Database.Beam.Schema.Lenses - ( tableLenses - , TableLens(..) -diff --git a/beam-core.cabal b/beam-core.cabal -index 4bf4ffd9..251d4d85 100644 ---- a/beam-core.cabal -+++ b/beam-core.cabal -@@ -64,8 +64,8 @@ - time >=1.6 && <1.10, - hashable >=1.1 && <1.3, - network-uri >=2.6 && <2.7, -- containers >=0.5 && <0.6, -- vector-sized >=0.5 && <1.1, -+ containers >=0.5 && <0.7, -+ vector-sized >=0.5 && <1.3, - tagged >=0.8 && <0.9 - Default-language: Haskell2010 - default-extensions: ScopedTypeVariables, OverloadedStrings, GADTs, RecursiveDo, FlexibleInstances, FlexibleContexts, TypeFamilies, diff --git a/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch deleted file mode 100644 index b715140be0a53..0000000000000 --- a/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Database/Beam/Migrate/Generics/Types.hs b/Database/Beam/Migrate/Generics/Types.hs -index 553e208b..0cf9b2c8 100644 ---- a/Database/Beam/Migrate/Generics/Types.hs -+++ b/Database/Beam/Migrate/Generics/Types.hs -@@ -1,3 +1,5 @@ -+{-# LANGUAGE UndecidableInstances #-} -+ - module Database.Beam.Migrate.Generics.Types where - - import Database.Beam.Migrate.Types -diff --git a/beam-migrate.cabal b/beam-migrate.cabal -index f53b280d..9cf3722c 100644 ---- a/beam-migrate.cabal -+++ b/beam-migrate.cabal -@@ -69,13 +69,12 @@ library - mtl >=2.2 && <2.3, - scientific >=0.3 && <0.4, - vector >=0.11 && <0.13, -- containers >=0.5 && <0.6, - unordered-containers >=0.2 && <0.3, - hashable >=1.2 && <1.3, - parallel >=3.2 && <3.3, - deepseq >=1.4 && <1.5, - ghc-prim >=0.5 && <0.6, -- containers >=0.5 && <0.6, -+ containers >=0.5 && <0.7, - haskell-src-exts >=1.18 && <1.21, - pretty >=1.1 && <1.2, - dependent-map >=0.2 && <0.3, diff --git a/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch deleted file mode 100644 index ede2bce125705..0000000000000 --- a/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/Database/Beam/Postgres/Connection.hs b/Database/Beam/Postgres/Connection.hs -index 433f55b9..5836c53d 100644 ---- a/Database/Beam/Postgres/Connection.hs -+++ b/Database/Beam/Postgres/Connection.hs -@@ -52,6 +52,8 @@ import qualified Database.PostgreSQL.Simple.Types as Pg (Null(..), Query(..)) - - import Control.Monad.Reader - import Control.Monad.State -+import Control.Monad.Fail (MonadFail) -+import qualified Control.Monad.Fail as Fail - - import Data.ByteString (ByteString) - import Data.ByteString.Builder (toLazyByteString, byteString) -@@ -302,6 +304,9 @@ deriving instance Functor PgF - newtype Pg a = Pg { runPg :: F PgF a } - deriving (Monad, Applicative, Functor, MonadFree PgF) - -+instance MonadFail Pg where -+ fail e = fail $ "Internal Error with: " <> show e -+ - instance MonadIO Pg where - liftIO x = liftF (PgLiftIO x id) - -diff --git a/beam-postgres.cabal b/beam-postgres.cabal -index e14b84f5..d29a5b67 100644 ---- a/beam-postgres.cabal -+++ b/beam-postgres.cabal -@@ -31,7 +31,7 @@ library - beam-migrate >=0.3 && <0.4, - - postgresql-libpq >=0.8 && <0.10, -- postgresql-simple >=0.5 && <0.6, -+ postgresql-simple >=0.5 && <0.7, - - text >=1.0 && <1.3, - bytestring >=0.10 && <0.11, -@@ -38,7 +38,7 @@ library - - hashable >=1.1 && <1.3, - lifted-base >=0.2 && <0.3, -- free >=4.12 && <5.1, -+ free >=4.12 && <5.2, - time >=1.6 && <1.10, - monad-control >=1.0 && <1.1, - mtl >=2.1 && <2.3, diff --git a/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch deleted file mode 100644 index ebfca8a2f6557..0000000000000 --- a/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Database/Beam/Sqlite/Connection.hs b/Database/Beam/Sqlite/Connection.hs -index f034b272..4e459ea3 100644 ---- a/Database/Beam/Sqlite/Connection.hs -+++ b/Database/Beam/Sqlite/Connection.hs -@@ -37,6 +37,7 @@ import Database.SQLite.Simple.Types (Null) - - import Control.Exception (bracket_, onException, mask) - import Control.Monad (forM_, replicateM_) -+import Control.Monad.Fail (MonadFail) - import Control.Monad.Free.Church - import Control.Monad.IO.Class (MonadIO(..)) - import Control.Monad.Identity (Identity) -@@ -143,7 +144,7 @@ newtype SqliteM a - { runSqliteM :: ReaderT (String -> IO (), Connection) IO a - -- ^ Run an IO action with access to a SQLite connection and a debug logging - -- function, called or each query submitted on the connection. -- } deriving (Monad, Functor, Applicative, MonadIO) -+ } deriving (Monad, Functor, Applicative, MonadIO, MonadFail) - - newtype BeamSqliteParams = BeamSqliteParams [SQLData] - instance ToRow BeamSqliteParams where diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 02ce07bdf4719..12631cee38ae5 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1"; + sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd"; }; + patches = [ + (fetchpatch { + name = "bytecode-error-handling.patch"; + url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch"; + sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92"; + excludes = [ "AUTHORS" "NEWS.rst" ]; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ appdirs astor clint + fastentrypoints funcparserlib rply ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 882de562114a0..33d00afd9e707 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h"; + cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 2fbf7a0be2cf4..ba68f046b0a0d 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "aravis"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga"; + sha256 = "0zlmw040iv0xx9qw7ygzbl96bli6ivll2fbziv19f4bdc0yhqjpw"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e4296810f35f2..cff32ca2d70f3 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -7,11 +7,11 @@ let pname = "cogl"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.22.2"; + version = "1.22.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; + sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"; }; patches = [ diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix new file mode 100644 index 0000000000000..da2fd13465f2e --- /dev/null +++ b/pkgs/development/libraries/ethash/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, cmake, boost, cryptopp, opencl-headers, opencl-info, + openmpi, ocl-icd, mesa, gbenchmark, gtest }: + +stdenv.mkDerivation rec { + pname = "ethash"; + version = "0.4.2"; + + src = + fetchFromGitHub { + owner = "chfast"; + repo = "ethash"; + rev = "v${version}"; + sha256 = "0qiixvxbpl2gz7jh1qs8lmyk7wzv6ffnl7kckqgrpgm547nnn8zy"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + cryptopp + opencl-headers + opencl-info + openmpi + ocl-icd + mesa + ]; + + checkInputs = [ + gbenchmark + gtest + ]; + + #preConfigure = '' + # sed -i 's/GTest::main//' test/unittests/CMakeLists.txt + # cat test/unittests/CMakeLists.txt + # ln -sfv ${gtest.src}/googletest gtest + #''; + + # NOTE: disabling tests due to gtest issue + cmakeFlags = [ + "-DHUNTER_ENABLED=OFF" + "-DETHASH_BUILD_TESTS=OFF" + #"-Dbenchmark_DIR=${gbenchmark}/lib/cmake/benchmark" + #"-DGTest_DIR=${gtest.dev}/lib/cmake/GTest" + #"-DGTest_DIR=${gtest.src}/googletest" + #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake" + ]; + + meta = with stdenv.lib; { + description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; + homepage = https://github.com/ethereum/ethash; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nand0p ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 37be3c01d9379..d2f66ad55f0d2 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.03.18.00"; + version = "2019.04.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0g7c2lq4prcw9dd5r4q62l8kqm8frczrfq8m4mgs22np60yvmb6d"; + sha256 = "08aniprv2a96d3k36k668maq9nysxh0cm58i0hvy71cqcmc97h7p"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 878c822154290..6e393ba02ce6d 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.13.1"; + name = "itk-4.13.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz; - sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al"; + url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; + sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 1c62d79ed3287..b543d47a050d3 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,10 +1,7 @@ -{ stdenv -, fetchFromGitHub -, cmake -, python -}: +{ stdenv , fetchFromGitHub , cmake , python }: + stdenv.mkDerivation rec { - name = "jsoncpp-${version}"; + pname = "jsoncpp"; version = "1.8.4"; src = fetchFromGitHub { @@ -36,13 +33,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; meta = with stdenv.lib; { inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A C++ library for interacting with JSON."; - maintainers = with maintainers; [ ttuegel cpages ]; + maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 7c7ba82ccde4c..a98748d3b52ba 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "10zyqgccgl8kl9d9ljml86sm9s9l2424y55vilb3lifkdb9019p6"; + sha256 = "0f138xlldzci8wic89i9vpka3mdsn8r78khpnk3wijlbgjhphr0h"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index e3a6580038a26..d5edefc5d54b4 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.27.8"; + version = "0.28.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1"; + sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"; }; postPatch = '' diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 92b6ec43d4065..c5379692ad306 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "libiconv-${version}"; - version = "1.15"; + version = "1.16"; src = fetchurl { url = "mirror://gnu/libiconv/${name}.tar.gz"; - sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; + sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; setupHooks = [ diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 5f295009b9940..1a177dc223741 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "liblinear-${version}"; - version = "2.21"; + version = "2.30"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs"; + sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748"; }; buildPhase = '' diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 09eb7d95f3700..172b9cd88da50 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.12"; + version = "19.04"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0kvfhcij32jfkggbhqzy7bfiwrly5j51d5gdz5lrfdcjq113svwp"; + sha256 = "1yr2vl2z9z1kllr5ygi39r1ryw695cic8yj34yragkk33l1z6xc2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 9203928bd70ff..a7e52376e3f59 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.14"; + version="0.3.15"; name="${baseName}-${version}"; - hash="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.14/libmwaw-0.3.14.tar.xz"; - sha256="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; + hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; + sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 3478ae14e6687..564fb96d0be4f 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.71"; + name = "libpst-0.6.72"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; + sha256 = "01ymym0218805g7bqhr7x2rlhzsbsbidi3nr0z2r2w07xf8xh6ca"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 4aa33236a9ebc..5127bd65c090f 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q"; + sha256 = "1r0l0aik3fiyskpdgw93gxqgw109g6pa27y983rirhl6rricp3wf"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 2da2963cfa669..db8dfcf2eecb8 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "131qpmp2h43snx0fx7jc810mil0zy52gy2dci367ln38a2pwvyhg"; + sha256 = "0fg4js390gj9lhyh9hmr7k3lhg5q1r47skyvziv9dmbj9dqm1ll7"; }; buildInputs = [ diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 143919d148e55..c90e0ee009e8f 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre821_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6"; - sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7"; + rev = "7b989f34191302011b5b49bf5b26b36862d54056"; + sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; }; enableParallelBuilding = true; @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { [ "prefix=$(out)" "includedir=$(dev)/include" "libdir=$(lib)/lib" + "mandir=$(man)/share/man" ]; - # Copy the examples into $out and man pages into $man. This should be handled - # by the build system in the future and submitted upstream. + # Copy the examples into $out. postInstall = '' - mkdir -p $out/bin $man/share/man/man2/ - cp -R ./man/* $man/share/man/man2 + mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin ''; diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 61cae1b68ba72..257ac8e277dcd 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libxmlb-${version}"; - version = "0.1.7"; + version = "0.1.8"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "17q1kjkff0frvm26agbqi0hdhg5d4icwn36qzf3y53wrdv5s148x"; + sha256 = "0nry2a4vskfklykd20smp4maqpzibc65rzyv4i71nrc55dyjpy7x"; }; nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index f9d07d8d7373b..0b063df51148d 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.03.06"; + version = "2019.04.24"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b"; + sha256 = "0wnxc4g04afsash1jn240zgdzh6lxa6rsaghahk34zlllb74dgdv"; }; postPatch = '' diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 7fb79c549be8a..cc86ab19379db 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-2.0.3"; + name = "log4cplus-2.0.4"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w"; + sha256 = "0lh2i22znx573jchcfy4n5lrr9yjg2hd3iphhlih61zzmd67p2hc"; }; meta = { diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 3b0a0441cc4e6..16502ca4e612f 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, boost }: stdenv.mkDerivation rec { - version = "1.3.1"; - name = "mdds-${version}"; + pname = "mdds"; + version = "1.4.3"; src = fetchurl { - url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; - sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; + url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; + sha256 = "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5"; }; postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" + mkdir -p "$out/lib/pkgconfig" + cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; checkInputs = [ boost ]; diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index d57c10b41e957..2d1e0ffb2005c 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -11,7 +11,7 @@ , doxygen }: -let version = "7.3.0p2"; +let version = "7.3.0p3"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0nc9k1nqpj0n99pr7qkva79irmqhh007dffwghiyzs031zhd7i6w"; + sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 30383dda50cf9..156a8c4c15cbf 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.4.0"; +let version = "8.4.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; + sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 1ae46bad257ce..30453086d457d 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.12"; + version = "3.12.13"; src = fetchurl { url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "1kh680ilw1c304hdh9i267gqhp0xg58jy8dk4svjvjc86sp1i23q"; + sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix new file mode 100644 index 0000000000000..529f910c35aee --- /dev/null +++ b/pkgs/development/libraries/smesh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }: + +stdenv.mkDerivation rec { + pname = "smesh"; + version = "6.7.6"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "smesh"; + rev = version; + sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0"; + }; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ opencascade ]; + + meta = with stdenv.lib; { + description = "Extension to OCE providing advanced meshing features"; + homepage = "https://github.com/tpaviot/smesh"; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/development/python-modules/addic7ed-cli/default.nix new file mode 100644 index 0000000000000..a9720f45ef6f9 --- /dev/null +++ b/pkgs/development/python-modules/addic7ed-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages, }: + +python3Packages.buildPythonApplication rec { + pname = "addic7ed-cli"; + version = "1.4.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "16nmyw7j2igx5dxflwiwblf421g69rxb879n1553wv6hxi4x27in"; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + pyquery + ]; + + meta = with lib; { + description = "A commandline access to addic7ed subtitles"; + homepage = https://github.com/BenoitZugmeyer/addic7ed-cli; + license = licenses.mit; + maintainers = with maintainers; [ aethelz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix new file mode 100644 index 0000000000000..4a921b2390d79 --- /dev/null +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "fastentrypoints"; + version = "0.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z"; + }; + + meta = with stdenv.lib; { + description = "Makes entry_points specified in setup.py load more quickly"; + homepage = https://github.com/ninjaaron/fast-entry_points; + license = licenses.bsd2; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index c5e9b1028288d..b318016ee815d 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "226d1d0960f86ba5d9efd426a70b291eaba96f47d071657e0254ea969025728a"; + sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0"; }; checkInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { ]; checkPhase = '' + rm -fr tests/__pycache__/ py.test ''; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 9d6461168d4e2..aab9f827da0f7 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; + sha256 = "13b9ah54z6g3w8p74a1anmyz84nrxy27snqv6vp95wsizp8zwsyn"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d47f5ce39fec8..2db6ad1c3d03b 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.2.2"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; + sha256 = "443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 2ca26ad65e8c4..226f1743a2a05 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,25 +2,16 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.9.1"; + version = "1.10.0"; propagatedBuildInputs = [ six EditorConfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; + sha256 = "1e389572ade865173605471e98df4002f4b6e5235121c13f1e4497a3eac69108"; }; - patches = [ - (fetchpatch { - url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; - sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; - }) - ]; - - patchFlags = [ "-p2" ]; - meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index c028eaaaa1422..093d0d39ddd3c 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.670"; + version = "0.700"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d"; + sha256 = "1zxfi5s9hxrz0hbaj4n513az17l44pxl80r62ipjc0bsmbcic2xi"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 08c908e0aa594..acb46af46b334 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.3"; + version = "3.9.5"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1frwwqkk0y1bkcm7bdzbyv2119vv640ncgs4d55zhbs70fxm2ylj"; + sha256 = "0c2hkkpp9rajnw5px17wd72x95k7wc2a0iy55pjhi5ly2cqd9ylv"; }; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 20b391311355a..693477d20c080 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.32.0"; + version = "2.32.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a"; + sha256 = "1283cbwd2kacgdij96xk26721f6amyzdhy2py11kdj5cprdlm5c4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 27ef453998221..7142b40ce0b0a 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ${python.interpreter} -m pyfakefs.tests.all_tests ${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages - ${python.interpreter} -m pytest pyfakefs/tests/pytest/pytest_plugin_test.py + ${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index fc269641ecfdc..47d6ea7e26b84 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, mock, pytest, six, systemd }: +{ stdenv, python, systemd }: -buildPythonPackage rec { +python.pkgs.buildPythonPackage rec { pname = "pystemd"; - version = "0.5.0"; - src = fetchPypi { + version = "0.6.0"; + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "000001hxv25vwcsvc0avg42v89c7qcjdpw6dr8419prmcb9186i5"; + sha256 = "054a3ni71paqa1xa786840z3kjixcgyqdbscyq8nfxp3hwn0gz5i"; }; + disabled = !python.pkgs.isPy3k; + buildInputs = [ systemd ]; - propagatedBuildInputs = [ six ]; - checkInputs = [ pytest mock ]; + checkInputs = with python.pkgs; [ pytest mock ]; checkPhase = "pytest tests"; meta = with stdenv.lib; { description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; homepage = https://github.com/facebookincubator/pystemd/; - license = licenses.bsd0; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index 53e1fce493d1c..c03590f8de885 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; + sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; }; # package has no tests diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix new file mode 100644 index 0000000000000..b3a9cfe82ee42 --- /dev/null +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -0,0 +1,37 @@ +{ stdenv, python, fetchFromGitHub, cmake, swig, ninja, + opencascade, smesh, freetype, libGL, libGLU, libX11 }: + +stdenv.mkDerivation rec { + pname = "pythonocc-core"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "pythonocc-core"; + rev = version; + sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; + }; + + nativeBuildInputs = [ cmake swig ninja ]; + buildInputs = [ + python opencascade smesh + freetype libGL libGLU libX11 + ]; + + cmakeFlags = [ + "-Wno-dev" + "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" + + "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" + "-DSMESH_LIB_PATH=${smesh}/lib" + "-DPYTHONOCC_WRAP_SMESH=TRUE" + ]; + + meta = with stdenv.lib; { + description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; + homepage = "https://github.com/tpaviot/pythonocc-core"; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 1b501b0601276..08800552607c0 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.19"; + version = "3.5.20"; src = fetchPypi { inherit pname version; - sha256 = "47951166d897b60e9e7ca349db82a2b689e6478ac6078e2c7c88ca8becbb0c7d"; + sha256 = "06l7jfax1izvbddmmjw9xpyb7iy4n99v3chyv75d9djaklnqs93v"; }; checkInputs = [ glibcLocales ]; @@ -26,6 +26,7 @@ in buildPythonPackage rec { # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py + rm tests/test_platypus_images.py # Remove the tests that require Vera fonts installed rm tests/test_graphics_render.py diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 9c20226fea05f..f8fbf8e49f4a9 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.1"; + version = "6.26.2"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd"; + sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 25acc4f88bce2..adbcf539494aa 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; + sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cb7a2f19b5e36..f9f1addd4c31a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus +, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , libselinux ? null, libsepol ? null }@args: @@ -79,6 +79,11 @@ in buildInputs = [ which icu zlib ]; }; + cld3 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ protobuf ]; + }; + curb = attrs: { buildInputs = [ curl ]; }; @@ -174,9 +179,17 @@ in gtk2 = attrs: { nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly - CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; + # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; gobject-introspection = attrs: { @@ -201,6 +214,10 @@ in buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + idn-ruby = attrs: { + buildInputs = [ libidn ]; + }; + # disable bundle install as it can't install anything in addition to what is # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R # to compensate for read-only files in site_template in nix store. @@ -290,7 +307,15 @@ in pango = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; }; patron = attrs: { @@ -340,6 +365,10 @@ in buildInputs = [ imagemagick which ]; }; + rpam2 = attrs: { + buildInputs = [ linux-pam ]; + }; + ruby-libvirt = attrs: { buildInputs = [ libvirt pkgconfig ]; buildFlags = [ diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index ab00573965e8c..5294bb46f18dc 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.13.0"; + version = "6.14.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1g8ds38zwprjswm71y7l10l15rbh2s6ha9xpp20wjy823q9agbpq"; + sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index d4e5c5a38dcdd..832e8e3516452 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildPhase = '' ant - ./bin/buck build -c buck.release_version=${version} buck + PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck ''; installPhase = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 48b0631c64aaa..47db8c9fea634 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "19rp5kgdgyjfvg23m8dqlv6g1cs2c57nnw64ifjv24hqhy1xc0qk"; + sha256 = "154zjkccinf6nvbz5a8rdlkgy7fi6yz11wi100jn9cmsjydspax8"; }; goPackagePath = "github.com/containers/buildah"; @@ -46,7 +46,7 @@ in buildGoPackage rec { meta = { description = "A tool which facilitates building OCI images"; homepage = https://github.com/containers/buildah; - maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 2bb67d6f761bc..fac1a3958d372 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.3.7"; + version = "2.4.4"; name = "${pname}-${version}"; inherit jre8; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "045y1s4n8jd52jnk9kwd0k4x3yscvcfsf2rxzn0xngvn9nkw2g65"; + sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 85e7c07b8cced..f93bd9d28c814 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gocode-gomod-unstable-${version}"; - version = "2019-02-12"; - rev = "8cc90faaf4765d16de060350da41eadccc1a15d1"; + version = "2019-03-27"; + rev = "81059208699789f992bb4a4a3fedd734e335468d"; goPackagePath = "github.com/stamblerre/gocode"; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index fe684bbf7b6fb..7fd6fe623748e 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "3.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1z37znqzbn0x8s04pb9dxzni9jzl8m59nfrr14vypww42f9l5i7i"; + sha256 = "0lplkwgshh0x7r1daai9gflzwjnp3yfx4724h1myvidaz234v2wh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index 6c8270f85986f..8eb65281b3fe9 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotests-${version}"; - version = "1.5.2"; + version = "1.5.3"; rev = "v${version}"; goPackagePath = "github.com/cweill/gotests"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "cweill"; repo = "gotests"; - sha256 = "0ff2jvpc1xb5jr6dv9izlpfavxaivzirqmdmicpznrqjz0d56pri"; + sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9"; }; meta = { diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix index 6a333b58bec6a..df411303d944f 100644 --- a/pkgs/development/tools/gotests/deps.nix +++ b/pkgs/development/tools/gotests/deps.nix @@ -1,11 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; - url = "https://github.com/golang/tools"; - rev = "96b5a5404f303f074e6117d832a9873c439508f0"; - sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + url = "https://go.googlesource.com/tools"; + rev = "23463209683dad3f2b9cc7f7c2663e1847c59017"; + sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f"; }; } ] diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix deleted file mode 100644 index ec2fb334a3b3f..0000000000000 --- a/pkgs/development/tools/haskell/leksah/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, ghcWithPackages, gtk3, makeWrapper }: - -let -leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); -in stdenv.mkDerivation { - name = "leksah-${leksahEnv.version}"; - - buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \ - --prefix PATH : "${leksahEnv}/bin" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - broken = true; # 2018-09-13, no successful hydra build since 2017-08-19 - }; -} diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index bfad2a3d46a82..c46250142c9ec 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.31.0"; + version = "0.32.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0bqpflvnh423w54162r0d6l503lql1bwqykxw18s2fx1n1gb3n9a"; + sha256 = "0ha4n2gsfvcycwammywqr7xg5ydlgpflmlm380v767178p5r5llm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix new file mode 100644 index 0000000000000..904119bd6ae36 --- /dev/null +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, gtest, python, boost }: + +stdenv.mkDerivation rec { + pname = "cli11"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "CLIUtils"; + repo = "CLI11"; + rev = "v${version}"; + sha256 = "0wddck970pczk7c201i2g6s85mkv4f2f4zxy6mndh3pfz41wcs2d"; + }; + + nativeBuildInputs = [ cmake ]; + + checkInputs = [ boost python ]; + + doCheck = true; + + preConfigure = '' + rm -rfv extern/googletest + ln -sfv ${gtest.src} extern/googletest + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "CLI11 is a command line parser for C++11"; + homepage = https://github.com/CLIUtils/CLI11; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nand0p ]; + license = licenses.unfreeRedistributable; + }; + +} diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index d0d3c2326adb0..3099bc38dc203 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.12.3"; + version = "2.13.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "041wvby19dlcbb7x3yn2mbcfkrn0pkyjpgm40ngsks63kqzmkpdp"; + sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk"; }; nativeBuildInputs = [ qmake makeWrapper python ]; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index cea86f090d6a2..7141fdcee7e79 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { name = "openocd-${version}"; @@ -10,28 +10,28 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libftdi libusb1 hidapi ]; + buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ "--enable-jtag_vpi" "--enable-usb_blaster_libftdi" - "--enable-amtjtagaccel" - "--enable-gw16012" + (lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel") + (lib.enableFeature (! stdenv.isDarwin) "gw16012") "--enable-presto_libftdi" "--enable-openjtag_ftdi" - "--enable-oocd_trace" + (lib.enableFeature (! stdenv.isDarwin) "oocd_trace") "--enable-buspirate" - "--enable-sysfsgpio" + (lib.enableFeature stdenv.isLinux "sysfsgpio") "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" ]; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" if [ ! -f "$rules" ]; then @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ln -s "$rules" "$out/etc/udev/rules.d/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; longDescription = '' OpenOCD provides on-chip programming and debugging support with a layered @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = http://openocd.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 20105f362cf03..bce1e273cc415 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq"; + sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1"; }; - cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb"; + cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3eb0760b22201..d6c5718d3ec69 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security }: +, pkgconfig, curl, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x"; + sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; }; - cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb"; + cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 3d08a6b787d84..417f0a749c986 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.26.0"; - # rev is the 0.25.0 commit, mainly for skaffold version command output - rev = "d88680e9ede62da65500702670ef72fc9272a06f"; + version = "0.28.0"; + # rev is the 0.28.0 commit, mainly for skaffold version command output + rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "151x7hs1876ij5kc1xlm1m7pyff6i22ddhfvjsgwb8sjl4h1ays5"; + sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw"; }; meta = { diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix new file mode 100644 index 0000000000000..b2bee738344d4 --- /dev/null +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + name = "wasm-pack-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "rustwasm"; + repo = "wasm-pack"; + rev = "v${version}"; + sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4"; + }; + + cargoSha256 = "1xdx0gjqd4zyhnp72hz88rdmgry1m7rcw2j73lh67vp08z74y54y"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + # Tests fetch external resources and build artifacts. + # Disabled to work with sandboxing + doCheck = false; + + meta = with stdenv.lib; { + description = "A utility that builds rust-generated WebAssembly package"; + homepage = https://github.com/rustwasm/wasm-pack; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dhkl ]; + platforms = platforms.all; + }; +} |