diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 20:48:14 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 20:48:14 +0200 |
| commit | febd5e323d08db5912e33d247a5f12275277dfb6 (patch) | |
| tree | f50a941c9a2b6b52983d12ea371ad2118b058e42 /pkgs/development | |
| parent | 0061fae2e6fd62f6d2a76418b62815bd49add51c (diff) | |
| parent | e9183fd2d4d3bb222b2ce3492935ec26d207524a (diff) | |
| download | nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.tar nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.tar.gz nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.tar.bz2 nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.tar.lz nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.tar.xz nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.tar.zst nixpkgs-febd5e323d08db5912e33d247a5f12275277dfb6.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development')
35 files changed, 1160 insertions, 234 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 87d5c751e85..6dcd36eb3ea 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -59,7 +59,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "7.1.0"; +let version = "7.2.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; @@ -213,8 +213,8 @@ stdenv.mkDerivation ({ builder = ../builder.sh; src = fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca"; + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw"; }; inherit patches; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cdb15fd9f81..13063aeb975 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -899,4 +899,7 @@ self: super: { sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; }); + # happy 1.19.6 and later break some packages. + Agda = super.Agda.override { happy = self.happy_1_19_5; }; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 3914e3d9b93..b4e975187cc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -162,4 +162,7 @@ self: super: { comonad = dontCheck super.comonad; semigroupoids = dontCheck super.semigroupoids; + # https://github.com/simonmar/happy/issues/103 + happy = super.happy.override { mtl = self.mtl_2_2_1; }; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index fc0c34f0397..4153e96e74a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -36,6 +36,11 @@ self: super: { unix = null; xhtml = null; + # Make sure we can still build Cabal 1.x. + Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: { + prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; + }); + # cabal-install can use the native Cabal library. cabal-install = super.cabal-install.override { Cabal = null; }; @@ -63,9 +68,26 @@ self: super: { protolude = doJailbreak super.protolude; quickcheck-instances = doJailbreak super.quickcheck-instances; + # https://github.com/aristidb/aws/issues/238 + aws = doJailbreak super.aws; + + # https://github.com/jgm/pandoc/issues/3876 + pandoc = let fixSetup = pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/pull/3899.patch"; + sha256 = "0lk9vs2l1wc1kr0y8fkdcarfi4sjd3dl81r52n39r25xx9kqawv7"; + }; + in overrideCabal super.pandoc (drv: { + editedCabalFile = null; + patches = drv.patches or [] ++ [fixSetup]; + setupHaskellDepends = drv.setupHaskellDepends or [self.Cabal_1_24_2_0]; + preCompileBuildDriver = "setupCompileFlags+=' -package=Cabal-1.24.2.0'"; + }); + # LTS-9 versions do not compile. path = dontCheck super.path; path-io = super.path-io_1_3_3; trifecta = super.trifecta_1_7_1_1; + aeson-compat = dontCheck super.aeson-compat_0_3_7_1; # test suite needs QuickCheck 2.10.* + binary-orphans = dontCheck super.binary-orphans_0_1_7_0; # test suite needs QuickCheck 2.10.* } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 28e7532f1c4..45c3f094e2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2535,6 +2535,8 @@ extra-packages: - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-library == 1.2.* # required for haddock-api-2.16.x + - happy <1.19.6 # newer versions break Agda + - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms @@ -2807,9 +2809,12 @@ dont-distribute-packages: Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] + agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ] agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] + aip: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2944,10 +2949,11 @@ dont-distribute-packages: attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-data: [ "x86_64-darwin" ] + attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3646,11 +3652,18 @@ dont-distribute-packages: crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression-opcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4119,6 +4132,7 @@ dont-distribute-packages: explore: [ i686-linux, x86_64-linux, x86_64-darwin ] ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4204,6 +4218,7 @@ dont-distribute-packages: filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] + fillit: [ i686-linux, x86_64-linux, x86_64-darwin ] filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4251,6 +4266,7 @@ dont-distribute-packages: FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] follower: [ i686-linux, x86_64-linux, x86_64-darwin ] foma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4312,6 +4328,7 @@ dont-distribute-packages: fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] + fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4370,6 +4387,7 @@ dont-distribute-packages: generators: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4424,6 +4442,7 @@ dont-distribute-packages: ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-proofs: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4433,6 +4452,7 @@ dont-distribute-packages: giak: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-cairo: [ "x86_64-darwin" ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ "x86_64-darwin" ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4544,6 +4564,7 @@ dont-distribute-packages: gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] + grakn: [ i686-linux, x86_64-linux, x86_64-darwin ] grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4977,6 +4998,7 @@ dont-distribute-packages: hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpress: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5056,6 +5078,7 @@ dont-distribute-packages: hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] hipchat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hip: [ i686-linux, x86_64-linux, x86_64-darwin ] HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] Hipmunk-Utils: [ "x86_64-darwin" ] Hipmunk: [ "x86_64-darwin" ] @@ -5084,6 +5107,7 @@ dont-distribute-packages: HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5100,7 +5124,7 @@ dont-distribute-packages: hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-morpheus: [ "x86_64-darwin" ] + hmatrix-morpheus: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5120,6 +5144,7 @@ dont-distribute-packages: Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hnix: [ i686-linux, x86_64-linux, x86_64-darwin ] HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ] hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5137,11 +5162,11 @@ dont-distribute-packages: hois: [ i686-linux, x86_64-linux, x86_64-darwin ] hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ] hole: [ i686-linux, x86_64-linux, x86_64-darwin ] + hol: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-MapReduce: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Storage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hol: [ "x86_64-darwin" ] homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ] hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] homplexity: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5420,7 +5445,7 @@ dont-distribute-packages: hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-xml: [ "x86_64-darwin" ] + hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] H: [ "x86_64-darwin" ] hXmixer: [ "x86_64-darwin" ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5600,6 +5625,7 @@ dont-distribute-packages: iyql: [ i686-linux, x86_64-linux, x86_64-darwin ] j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + jack: [ i686-linux, x86_64-linux, x86_64-darwin ] jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] jack: [ "x86_64-darwin" ] @@ -5620,6 +5646,7 @@ dont-distribute-packages: jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + jenkinsPlugins2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5792,6 +5819,8 @@ dont-distribute-packages: language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] language-puppet: [ "x86_64-darwin" ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5927,6 +5956,7 @@ dont-distribute-packages: list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] + live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] llsd: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6119,6 +6149,7 @@ dont-distribute-packages: memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] + merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] messente: [ i686-linux, x86_64-linux, x86_64-darwin ] metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6141,8 +6172,12 @@ dont-distribute-packages: MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-util: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6245,6 +6280,7 @@ dont-distribute-packages: morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] + movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ] mp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6731,6 +6767,7 @@ dont-distribute-packages: plot-gtk3: [ "x86_64-darwin" ] Plot-ho-matic: [ "x86_64-darwin" ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6785,6 +6822,7 @@ dont-distribute-packages: postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6996,6 +7034,7 @@ dont-distribute-packages: react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-gi-gtk: [ "x86_64-darwin" ] reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7004,7 +7043,9 @@ dont-distribute-packages: reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-jack: [ "x86_64-darwin" ] + reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7105,6 +7146,7 @@ dont-distribute-packages: representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] repr: [ i686-linux, x86_64-linux, x86_64-darwin ] + reprinter: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] req: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7607,6 +7649,7 @@ dont-distribute-packages: sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] + squeal-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] sscan: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7618,6 +7661,7 @@ dont-distribute-packages: stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7710,6 +7754,7 @@ dont-distribute-packages: svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] + swagger-test: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7738,9 +7783,11 @@ dont-distribute-packages: syntax-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees-fork-bairyn: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] sysinfo: [ "x86_64-darwin" ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8241,6 +8288,7 @@ dont-distribute-packages: wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-secure-cookies: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8364,6 +8412,7 @@ dont-distribute-packages: x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] xbattbar: [ "x86_64-darwin" ] + xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] xdot: [ "x86_64-darwin" ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 36f5f28f2f8..6b0eb8c7002 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -105,6 +105,12 @@ self: super: builtins.intersectAttrs super { configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; }); + # library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32 + hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: { + preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal"; + configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; + })); + # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ba9864d2605..e281cf9e774 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -851,8 +851,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.6.0.0"; - sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja"; + version = "0.6.1.0"; + sha256 = "1358gafgm91vqsdn9wxpd9qzar1via9fl5xcg2pn30bcg7dsqahh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -9493,8 +9493,8 @@ self: { ({ mkDerivation, base, Hipmunk, linear, StateVar }: mkDerivation { pname = "Hipmunk-Utils"; - version = "0.1.0.0"; - sha256 = "0bybsm350fkqiwsmyd0x4ck4jrnzs1i0cdvww70dcbd2m4r099mm"; + version = "0.1.1.1"; + sha256 = "1nql9101c1philljk20idllpxgq79hlihkk3kyl57bk4cb4iyr2h"; libraryHaskellDepends = [ base Hipmunk linear StateVar ]; testHaskellDepends = [ base ]; homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme"; @@ -11047,8 +11047,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.6.0.0"; - sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc"; + version = "0.6.1.0"; + sha256 = "0h9b67x9mnn3nyz0a8lhh9amd511cgvmwlzaj7lkh8vqqxy2syhz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -15462,16 +15462,17 @@ self: { }) {}; "SCalendar" = callPackage - ({ mkDerivation, base, containers, text, time }: + ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "SCalendar"; - version = "0.1.0.0"; - sha256 = "0dvmfr82hnavgpiv2zi0dccldpyl84l653gncrbgd7dmdnmbsvw9"; - revision = "1"; - editedCabalFile = "0vcdmzisi7v7jsm6bj34q43f42ab0bhq992lyq740ickzp3a6k22"; + version = "1.0.0"; + sha256 = "0w69p3min1iijbk5cv645v5cizd2k5xwdzr52l7fg72bv17l0xcx"; libraryHaskellDepends = [ base containers text time ]; - homepage = "https://github.com/sebasHack/SCalendar"; - description = "XXXX"; + testHaskellDepends = [ + base containers hspec QuickCheck text time + ]; + homepage = "https://github.com/stackbuilders/scalendar"; + description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -17977,6 +17978,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Unique_0_4_7_1" = callPackage + ({ mkDerivation, base, containers, extra, hashable, hspec + , QuickCheck, unordered-containers + }: + mkDerivation { + pname = "Unique"; + version = "0.4.7.1"; + sha256 = "1a912180fk2xhz6md50n21xz0z89n9ylansyqxq034jgsfkz8b7s"; + libraryHaskellDepends = [ + base containers extra hashable unordered-containers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "It provides the functionality like unix \"uniq\" utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Unixutils" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, filepath , mtl, process, process-extras, pureMD5, regex-tdfa, unix, zlib @@ -22008,6 +22026,7 @@ self: { homepage = "http://github.com/liamoc/agda-snippets#readme"; description = "Render just the Agda snippets of a literate Agda file to HTML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-snippets-hakyll" = callPackage @@ -22025,6 +22044,7 @@ self: { homepage = "https://github.com/liamoc/agda-snippets#readme"; description = "Literate Agda support using agda-snippets, for Hakyll pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agentx" = callPackage @@ -22111,6 +22131,7 @@ self: { homepage = "https://github.com/qfpl/aip"; description = "Aeronautical Information Package (AIP)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "air" = callPackage @@ -25463,12 +25484,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_7" = callPackage + "ansi-terminal_0_7_1_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.7"; - sha256 = "1p66w12i2nr653ixdxly98q4g895a4nav8afmgq6yifm96shf89f"; + version = "0.7.1.1"; + sha256 = "1z2lllm5f2wy3a1j1198mpwq9cb6qclrxr2gpdzjyxzzvybpdj3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -28615,7 +28636,7 @@ self: { homepage = "https://github.com/nikita-volkov/attoparsec-data"; description = "Parsers for the standard Haskell data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-enumerator" = callPackage @@ -28732,6 +28753,7 @@ self: { homepage = "https://github.com/nikita-volkov/attoparsec-time"; description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-time_1" = callPackage @@ -41579,7 +41601,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chart-unit_0_5_1" = callPackage + "chart-unit_0_5_2" = callPackage ({ mkDerivation, base, colour, containers, data-default , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl , formatting, lens, linear, mwc-probability, mwc-random, numhask @@ -41588,8 +41610,8 @@ self: { }: mkDerivation { pname = "chart-unit"; - version = "0.5.1"; - sha256 = "1hwbhzs22glikckwbbj9y5hn2vdsz3178gdw7hjrb32aa5kxj45j"; + version = "0.5.2"; + sha256 = "1fslw870412dpc333hhxqhly7lz5gr8m2x7bvndfj4a98mmsv056"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41598,8 +41620,8 @@ self: { ]; executableHaskellDepends = [ base containers diagrams-lib diagrams-rasterific diagrams-svg foldl - lens mwc-probability mwc-random numhask primitive protolude tdigest - text + formatting lens mwc-probability mwc-random numhask primitive + protolude tdigest text ]; testHaskellDepends = [ base numhask tasty tasty-hspec text ]; homepage = "https://github.com/tonyday567/chart-unit"; @@ -47006,6 +47028,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_2_12" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, exceptions + , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, split + , transformers, transformers-base, transformers-compat, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.2.12"; + sha256 = "05k6kn83mw72xfqhrlsapnbsscyw1dqf1g335mxfifs2a32s1ad4"; + libraryHaskellDepends = [ + base exceptions lifted-base mmorph monad-control mtl primitive + resourcet transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck resourcet safe + split transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hspec kan-extensions mwc-random + transformers vector + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq @@ -50674,6 +50724,7 @@ self: { homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash"; description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-numbers" = callPackage @@ -51221,6 +51272,7 @@ self: { homepage = "https://github.com/anton-k/csound-catalog"; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -51241,6 +51293,7 @@ self: { homepage = "https://github.com/anton-k/csound-expression"; description = "library to make electronic music"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -51258,6 +51311,7 @@ self: { homepage = "https://github.com/anton-k/csound-expression-dynamic"; description = "dynamic core for csound-expression library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-opcodes" = callPackage @@ -51273,6 +51327,7 @@ self: { ]; description = "opcodes for the library csound-expression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -51294,6 +51349,7 @@ self: { homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -51306,6 +51362,7 @@ self: { homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csp" = callPackage @@ -59066,8 +59123,8 @@ self: { }: mkDerivation { pname = "distributed-process-monad-control"; - version = "0.5.1.2"; - sha256 = "1iz030x11qxbc6hnk77c6sfjx7i51d90ix6mgic4v3m7jfkzckr8"; + version = "0.5.1.3"; + sha256 = "16zlwlk52rc8q4bfxk9ah5ikyw2gh0bwws9lhvp5zkzlmhfmdzx1"; libraryHaskellDepends = [ base distributed-process monad-control transformers transformers-base @@ -66806,6 +66863,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "expressions" = callPackage + ({ mkDerivation, attoparsec, base, containers, lattices, QuickCheck + , singletons, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "expressions"; + version = "0.1.1"; + sha256 = "0vbykw97f1zb4nlj1ibamyk4bi0467ldlxwlknhr5b940dfs3rmy"; + libraryHaskellDepends = [ + attoparsec base containers lattices singletons text transformers + ]; + testHaskellDepends = [ + base QuickCheck singletons tasty tasty-quickcheck text + ]; + description = "Expressions and Formulas a la carte"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extcore" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, mtl, parsec, pretty, syb @@ -69208,6 +69284,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fillit" = callPackage + ({ mkDerivation, base, data-default, doctest, hspec, parsec, text + , unordered-containers + }: + mkDerivation { + pname = "fillit"; + version = "0.1.0.0"; + sha256 = "0qk1i2mjvsq3qqsh2zw9n83l210m0f17q9mqwnbmzhw0yf1mgswc"; + libraryHaskellDepends = [ + base data-default parsec text unordered-containers + ]; + testHaskellDepends = [ base doctest hspec unordered-containers ]; + homepage = "https://github.com/ishiy1993/fillit#readme"; + description = "Flexible string substitution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filter-logger" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, data-default, fast-logger, http-types, HUnit, scotty @@ -70905,6 +70999,7 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-transduce" = callPackage @@ -72685,6 +72780,7 @@ self: { homepage = "https://github.com/fpco/fsnotify-conduit#readme"; description = "Get filesystem notifications as a stream of events"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fst" = callPackage @@ -74252,21 +74348,22 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base, criterion, deepseq, hspec, lens, profunctors - , QuickCheck + ({ mkDerivation, base, criterion, deepseq, ghc-proofs, lens + , profunctors, QuickCheck }: mkDerivation { pname = "generic-lens"; - version = "0.4.0.0"; - sha256 = "0gqw9wdz2kf0jsx42l49f16xkb6yh741sv3kzss4d5laznmyh2v2"; + version = "0.4.0.1"; + sha256 = "1imldy8sf7cfzyhxfijh70pclrvdxxr0i4j5gygvi7n5khkh1ask"; libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base ghc-proofs ]; benchmarkHaskellDepends = [ base criterion deepseq lens QuickCheck ]; homepage = "https://github.com/kcsongor/generic-lens"; description = "Generic data-structure operations exposed as lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lucid-scaffold" = callPackage @@ -75943,6 +76040,7 @@ self: { homepage = "https://github.com/nomeata/ghc-proofs"; description = "GHC plugin to prove program equations by simplification"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-server" = callPackage @@ -76743,6 +76841,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {gdk-x11 = null;}; "gi-ggit" = callPackage @@ -77454,7 +77553,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ginger_0_6_0_2" = callPackage + "ginger_0_7_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers @@ -77462,8 +77561,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.6.0.2"; - sha256 = "0h6db6pm7i19rgn8hfx0m3qjl3b4ybf1ngd2451jn16n859sljbm"; + version = "0.7.0.0"; + sha256 = "0sxg3mc47f578srkcvgd5p52abxqmrbbydm3ngh16jpz998y8cm4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -81823,6 +81922,7 @@ self: { homepage = "https://github.com/graknlabs/grakn-haskell"; description = "A Haskell client for <http://grakn.ai Grakn>"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grammar-combinators" = callPackage @@ -82657,6 +82757,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "greenclip" = callPackage + ({ mkDerivation, base, binary, classy-prelude, directory, microlens + , microlens-mtl, text, unix, utf8-string, vector, X11 + }: + mkDerivation { + pname = "greenclip"; + version = "2.0.1"; + sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base binary classy-prelude directory microlens microlens-mtl text + unix utf8-string vector X11 + ]; + homepage = "https://github.com/erebe/greenclip#readme"; + description = "Simple clipboard manager to be integrated with rofi"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network , stm, system-uuid, time @@ -87719,6 +87838,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "happy_1_19_5" = callPackage + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, mtl, process + }: + mkDerivation { + pname = "happy"; + version = "1.19.5"; + sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32"; + revision = "2"; + editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, mtl, process @@ -89212,6 +89352,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "haskell-gi-overloading"; + version = "0.0"; + sha256 = "1smz5fr5saw1l129h21qcywyp47mrbf7355kmwkspjh75yl2gix5"; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Overloading support for haskell-gi"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-gi-overloading" = callPackage ({ mkDerivation }: mkDerivation { @@ -94896,6 +95049,7 @@ self: { homepage = "https://github.com/allonsy/hexpress"; description = "An express-like http framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexquote" = callPackage @@ -95483,12 +95637,12 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.2.1"; - sha256 = "0kc7sm8kny3vyhdfpkj543796c51zxm1s5xgmjzr8gmjzgrbidqb"; + version = "0.2.2"; + sha256 = "05ly5dl0x0khanbhl3yanns5zk9w1fblakqxyvc0yvhq0413991s"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; - homepage = "https://github.com/LukeHoersten/hgrev"; + homepage = "https://github.com/bitnomial/hgrev"; description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -96401,6 +96555,7 @@ self: { homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hipbot" = callPackage @@ -97156,6 +97311,7 @@ self: { homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; description = "A terminal UI as drop-in replacement for hledger add"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-interest" = callPackage @@ -97205,8 +97361,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.3.1"; - sha256 = "1pb49s54rg396b15753h5wi3iyhpd3dadn3cvs3bplb5r432ni1i"; + version = "1.3.2"; + sha256 = "1qlfzw8nh4isfjqmnq16qrfas9flhyn2b6mf9nvcg0bgm4m7hs7n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring @@ -97219,8 +97375,9 @@ self: { ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory doctest filepath Glob hashtables HUnit megaparsec mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split test-framework - test-framework-hunit text time transformers uglymemo utf8-string + old-time parsec pretty-show regex-tdfa safe semigroups split + test-framework test-framework-hunit text time transformers uglymemo + utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; @@ -97671,7 +97828,7 @@ self: { homepage = "https://github.com/Alexander-Ignatyev/morpheus/tree/master/hmatrix-morpheus"; description = "Low-level machine learning auxiliary functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hmatrix-nipals" = callPackage @@ -98097,6 +98254,7 @@ self: { homepage = "http://github.com/jwiegley/hnix"; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hnn" = callPackage @@ -98490,7 +98648,7 @@ self: { ]; description = "Higher order logic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hold-em" = callPackage @@ -106676,14 +106834,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-bits_0_7_0_1" = callPackage + "hw-bits_0_7_0_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-int , hw-prim, hw-string-parse, QuickCheck, safe, vector }: mkDerivation { pname = "hw-bits"; - version = "0.7.0.1"; - sha256 = "1h8gpxqlyiq6zfipbmv6377s21dx5idjjakw8rwwhp476pa6dxnw"; + version = "0.7.0.2"; + sha256 = "1s0as4d1a80hzx47zpa7qjiwdbgwzg1j4lgqd0grri5scq0iwqiq"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -106941,8 +107099,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "1.1.4"; - sha256 = "1vh3nq6mv8aq5ws17kilkcmdgxg1i1v582ddydrwz3p42kpg1qi4"; + version = "2.0.0"; + sha256 = "0l3vyygyan5j52af8g5s24435hxy0pr6j89yqzy5mp3dv12qlr53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106970,8 +107128,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "1.1.4"; - sha256 = "17rmal7kncddyqw7y3sa9kr5frv3gqcr4s85lb8k9iaj64wa2cfl"; + version = "2.0.0"; + sha256 = "0j1qwn9an397vl3y3mlrzhjw3c8jbmw1c0wpsywk0v0p7rfjg5nn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107069,6 +107227,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-prim-bits" = callPackage + ({ mkDerivation, base, criterion, vector }: + mkDerivation { + pname = "hw-prim-bits"; + version = "0.1.0.1"; + sha256 = "1fvmmp8l93j4wqcszk8lq4isl1xjyqnjzlaghs1wh9m6vywv5ncy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion vector ]; + homepage = "https://github.com/githubuser/hw-prim-bits#readme"; + description = "Primitive support for bit manipulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-rankselect" = callPackage ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim , hw-rankselect-base, QuickCheck, vector @@ -107226,7 +107401,7 @@ self: { homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -108199,6 +108374,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hyperion" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, clock + , containers, deepseq, directory, exceptions, filepath + , generic-deriving, hashable, hspec, lens, mtl + , optparse-applicative, process, QuickCheck, random, random-shuffle + , statistics, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "hyperion"; + version = "0.1.0.0"; + sha256 = "06292m9igzqilhw5ybmfqkbncg713644i31wdpn0yl8j9iyqw6im"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bytestring clock containers deepseq + directory exceptions filepath generic-deriving hashable lens mtl + optparse-applicative random random-shuffle statistics text time + unordered-containers vector + ]; + executableHaskellDepends = [ base process ]; + testHaskellDepends = [ + base hspec lens QuickCheck text unordered-containers + ]; + homepage = "https://github.com/tweag/hyperion#readme"; + description = "Reliable performance measurement with robust data export"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hyperloglog" = callPackage ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory @@ -113921,6 +114124,7 @@ self: { homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme"; description = "Generate nix for Jenkins plugins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jespresso" = callPackage @@ -119281,6 +119485,7 @@ self: { homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python-colour" = callPackage @@ -119312,6 +119517,7 @@ self: { homepage = "http://github.com/bjpop/language-python-test"; description = "testing code for the language-python library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-qux" = callPackage @@ -123530,6 +123736,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liveplot" = callPackage @@ -123871,6 +124078,34 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {llvm-config = null;}; + "llvm-hs_5_0_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , containers, exceptions, llvm-config, llvm-hs-pure, mtl + , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, transformers, transformers-compat + , utf8-string + }: + mkDerivation { + pname = "llvm-hs"; + version = "5.0.0"; + sha256 = "1lngf77ir1ffmqmwjpvax3rwmkapqrap66nc5lms3zxkpd3sh31x"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers exceptions llvm-hs-pure + mtl template-haskell transformers transformers-compat utf8-string + ]; + libraryToolDepends = [ llvm-config ]; + testHaskellDepends = [ + base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck + tasty tasty-hunit tasty-quickcheck temporary transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "General purpose LLVM bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {llvm-config = null;}; + "llvm-hs-pure" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, mtl , tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -123893,6 +124128,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "llvm-hs-pure_5_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, mtl + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "5.0.0"; + sha256 = "1brz1zc9mmx4vyivvidjxv4x3i04wwpn1y060lcpnzmp89zz5pc1"; + libraryHaskellDepends = [ + attoparsec base bytestring containers mtl template-haskell + transformers transformers-compat + ]; + testHaskellDepends = [ + base containers mtl tasty tasty-hunit tasty-quickcheck transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-ht" = callPackage ({ mkDerivation, base, bytestring, directory, mtl, process , type-level @@ -129536,6 +129794,7 @@ self: { ]; description = "A modified Merkle Patricia DB"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mersenne-random" = callPackage @@ -130169,6 +130428,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Handling of MIDI messages and files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-alsa" = callPackage @@ -130183,7 +130443,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-music-box" = callPackage @@ -130204,6 +130464,7 @@ self: { homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-simple" = callPackage @@ -130243,6 +130504,7 @@ self: { homepage = "http://github.com/mtolly/midi-util"; description = "Utility functions for processing MIDI files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-utils" = callPackage @@ -132071,6 +132333,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_25_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.25.1"; + sha256 = "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -133685,6 +133970,7 @@ self: { homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "moving-averages" = callPackage @@ -141290,6 +141576,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-trans_0_3_6" = callPackage + ({ mkDerivation, base, mtl, opaleye, postgresql-simple + , product-profunctors, transformers, transformers-base + }: + mkDerivation { + pname = "opaleye-trans"; + version = "0.3.6"; + sha256 = "03pg31rxnfw22zqpk3l098z32gl2r4dk9pma8z4f8ssp7crz7z8p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mtl opaleye postgresql-simple product-profunctors transformers + transformers-base + ]; + executableHaskellDepends = [ + base opaleye postgresql-simple product-profunctors + ]; + homepage = "https://github.com/WraithM/opaleye-trans"; + description = "A monad transformer for Opaleye"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "open-browser" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -141852,14 +142161,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "openssl-streams_1_2_1_2" = callPackage + "openssl-streams_1_2_1_3" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams , network, test-framework, test-framework-hunit }: mkDerivation { pname = "openssl-streams"; - version = "1.2.1.2"; - sha256 = "0szfh7jjp8z8yz043a5vil8i1nhrwshaklx2m62n0jz8p6ff3h1b"; + version = "1.2.1.3"; + sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -148404,6 +148713,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "ping-wrapper" = callPackage + ({ mkDerivation, attoparsec, base, either, optparse-applicative + , optparse-generic, ping-parser-attoparsec, placeholders, process + , text + }: + mkDerivation { + pname = "ping-wrapper"; + version = "0.1.0.1"; + sha256 = "0f0j324z94znvyp77dnpjdjimfrz8zs8iyk9f0vpr9j8y3bg4d3d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base either ping-parser-attoparsec placeholders process + text + ]; + executableHaskellDepends = [ + base optparse-applicative optparse-generic + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/frincon/ping-wrapper"; + description = "Haskell Ping wrapper"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -150045,6 +150378,7 @@ self: { homepage = "https://github.com/ocramz/plot-light"; description = "A lightweight plotting library, exporting to SVG"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -150080,8 +150414,8 @@ self: { ({ mkDerivation, base, hspec, optparse-applicative, process }: mkDerivation { pname = "ploton"; - version = "0.3.0.0"; - sha256 = "1c045pc42bangg2rlclc91ad78ynjbc5lccmc33hjswcxynv6lj2"; + version = "1.0.0.0"; + sha256 = "1x2ypljgknyya3pwg2y323va1hl396qm30lfy982sa6p0d0m8hfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optparse-applicative process ]; @@ -150814,10 +151148,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "polyvariadic"; - version = "0.3.0.0"; - sha256 = "13q6sq56gkn6gfjl9mblhjkkfk5bgi86l1x2x9yirfjms4x8445z"; - revision = "1"; - editedCabalFile = "0xnj571ccbpwnra5nzlvsj9qfj79aiq2cphwl8454jpl17cjnir2"; + version = "0.3.0.1"; + sha256 = "0bnwcpk5bgp784d68427vbcdvyavqpj87khwr5gdyxr58apih2z6"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/fgaz/polyvariadic"; description = "Creation and application of polyvariadic functions"; @@ -151857,49 +152189,49 @@ self: { }) {}; "postgrest" = callPackage - ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async - , auto-update, base, base64-bytestring, bytestring - , case-insensitive, cassava, configurator-ng, containers - , contravariant, cookie, either, hasql, hasql-pool - , hasql-transaction, heredoc, hjsonpointer, hjsonschema, hspec - , hspec-wai, hspec-wai-json, HTTP, http-types - , insert-ordered-containers, interpolatedstring-perl6, jwt, lens + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async, base + , base64-bytestring, bytestring, case-insensitive, cassava + , configurator-ng, containers, contravariant, cookie, either, hasql + , hasql-pool, hasql-transaction, heredoc, hjsonpointer, hjsonschema + , hspec, hspec-wai, hspec-wai-json, HTTP, http-types + , insert-ordered-containers, interpolatedstring-perl6, jose, lens , lens-aeson, monad-control, network-uri, optparse-applicative , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe - , scientific, swagger2, text, time, transformers-base, unix + , scientific, swagger2, text, transformers-base, unix , unordered-containers, vector, wai, wai-cors, wai-extra , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.4.2.0"; - sha256 = "0256mjq9xc0shanyb54p1bhbpb68mdadc71c5p7lpr0q4cn91c0m"; + version = "0.4.3.0"; + sha256 = "1a0l5j755h6nlnv3xww0l88pz6ny5y40d1as9vfn1i1ybk4jx5gq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base bytestring case-insensitive cassava - configurator-ng containers contravariant cookie either hasql - hasql-pool hasql-transaction heredoc HTTP http-types - insert-ordered-containers interpolatedstring-perl6 jwt lens - lens-aeson network-uri optparse-applicative parsec protolude - Ranged-sets regex-tdfa safe scientific swagger2 text time + aeson ansi-wl-pprint base base64-bytestring bytestring + case-insensitive cassava configurator-ng containers contravariant + cookie either hasql hasql-pool hasql-transaction heredoc HTTP + http-types insert-ordered-containers interpolatedstring-perl6 jose + lens lens-aeson network-uri optparse-applicative parsec protolude + Ranged-sets regex-tdfa safe scientific swagger2 text unordered-containers vector wai wai-cors wai-extra wai-middleware-static ]; executableHaskellDepends = [ - auto-update base base64-bytestring bytestring hasql hasql-pool - protolude retry text time unix warp + base base64-bytestring bytestring hasql hasql-pool protolude retry + text unix warp ]; testHaskellDepends = [ - aeson aeson-qq async auto-update base base64-bytestring bytestring + aeson aeson-qq async base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool heredoc hjsonpointer hjsonschema hspec hspec-wai hspec-wai-json http-types lens lens-aeson monad-control process protolude - regex-tdfa time transformers-base wai wai-extra + regex-tdfa transformers-base wai wai-extra ]; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgrest-ws" = callPackage @@ -154188,13 +154520,13 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "0.4.1"; - sha256 = "1fvpfbzpwdpscn3gnpz6wnbk6w6fah3d6pxzn1mrx0m2a4rracis"; + version = "0.4.2"; + sha256 = "0k5avxjv1z4cfrx5x368ygzv30ghwykv4ngifigy1ydnmp7c7n1h"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-types text transformers wai warp ]; - homepage = "http://github.com/LukeHoersten/prometheus#readme"; + homepage = "http://github.com/bitnomial/prometheus"; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -157976,17 +158308,17 @@ self: { }) {}; "random-bytestring" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, entropy - , ghc-prim, mwc-random, primitive, random + ({ mkDerivation, async, base, bytestring, criterion, cryptonite + , entropy, ghc-prim, mwc-random, pcg-random, primitive, random }: mkDerivation { pname = "random-bytestring"; - version = "0.1.1"; - sha256 = "08hpzxa4dzxpkcsb18yg093h7z14x73rfhg3l1qs9mddj37wghmh"; - libraryHaskellDepends = [ base bytestring mwc-random ]; + version = "0.1.2"; + sha256 = "132xlls7qw94y2ljc74m0qhlzb19yv3yfxmwhi25cnghggsb22qz"; + libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; benchmarkHaskellDepends = [ - async base bytestring criterion entropy ghc-prim mwc-random - primitive random + async base bytestring criterion cryptonite entropy ghc-prim + mwc-random pcg-random primitive random ]; homepage = "https://www.github.com/larskuhtz/random-bytestring"; description = "Efficient generation of random bytestrings"; @@ -159302,6 +159634,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana" = callPackage @@ -159505,6 +159838,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -162712,6 +163046,7 @@ self: { ]; description = "Scrap Your Reprinter"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reproject" = callPackage @@ -165158,7 +165493,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_4_0_0" = callPackage + "rss-conduit_0_4_1_0" = callPackage ({ mkDerivation, atom-conduit, base, bytestring, conduit , conduit-combinators, containers, data-default , dublincore-xml-conduit, hlint, lens-simple, mono-traversable @@ -165169,13 +165504,12 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.4.0.0"; - sha256 = "0120r3hb6321cb8n8q3l9fybmjndar8plplgx2qxnxwsbq4r7h10"; + version = "0.4.1.0"; + sha256 = "0lal33vjsdz5k63ljlx4430an1x3hgw6nn1aixf531bwdglxgg5c"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers - dublincore-xml-conduit lens-simple mono-traversable safe - safe-exceptions singletons text time timerep uri-bytestring vinyl - xml-conduit xml-types + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types ]; testHaskellDepends = [ atom-conduit base bytestring conduit conduit-combinators @@ -165959,6 +166293,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safeio_0_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , directory, filepath, HUnit, resourcet, test-framework + , test-framework-hunit, test-framework-th, unix + }: + mkDerivation { + pname = "safeio"; + version = "0.0.4.0"; + sha256 = "1abbg6nxpz4va54r2005swlyw8k4y61xjhcz4s3rshc09cmrrn6l"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + resourcet unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + HUnit resourcet test-framework test-framework-hunit + test-framework-th unix + ]; + description = "Write output to disk atomically"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safepath" = callPackage ({ mkDerivation, base, doctest, text, validity }: mkDerivation { @@ -166100,8 +166457,8 @@ self: { }: mkDerivation { pname = "salve"; - version = "0.0.5"; - sha256 = "05m24awd4laqxh5mqbi1yzpmbnz2s8sh4xsz7j128dcxlsnrkldf"; + version = "0.0.6"; + sha256 = "1269qhsck9mx5adhzbvyznbfmi2lwrafmf8b750y31cpiziw4mfb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest microlens ]; benchmarkHaskellDepends = [ @@ -166680,8 +167037,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.2"; - sha256 = "0kqgx84kp1y63iakmmhfcgmqn4b7d3hrgcl2j7xdzi3fw6ig93y7"; + version = "7.3"; + sha256 = "01vcil4zij8ap1bnkmmi8439mmnsbw3qc1gw994wdnar082wzh66"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -166767,6 +167124,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scalendar" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: + mkDerivation { + pname = "scalendar"; + version = "1.1.0"; + sha256 = "077v0k745z1hs8k8yb5s6ln1ing8b5fllp7gw2kcrlrw108ijvwb"; + libraryHaskellDepends = [ base containers text time ]; + testHaskellDepends = [ + base containers hspec QuickCheck text time + ]; + homepage = "https://github.com/stackbuilders/scalendar"; + description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; + license = stdenv.lib.licenses.mit; + }) {}; + "scalp-webhooks" = callPackage ({ mkDerivation, aeson, async, base, bytestring, hastache, hspec , lens, lens-aeson, rainbow, random, regex-compat, shelly, Spock @@ -169066,10 +169438,12 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "seqid"; - version = "0.5.1"; - sha256 = "15b6z2jq8gaygrblxhql5yimxjczxzzyjfjbhpjyymx4c7l6r8yf"; + version = "0.5.2"; + sha256 = "0b1c2fdrfxbgh8b1pbj5d436lylc73wjwnlkvhnx0mmg9ay8ixf9"; + revision = "1"; + editedCabalFile = "0khdf4panw2wvs80z6lx1vgn5h7xaswdxsh9rppb1fvvfjqzb7d9"; libraryHaskellDepends = [ base mtl transformers ]; - homepage = "https://github.com/LukeHoersten/seqid"; + homepage = "https://github.com/bitnomial/seqid"; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -169090,10 +169464,10 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.6.1"; - sha256 = "17chhnyfzjn6lkd9b1ilz9s0swayhwplawhwnmnjfbk8fgybc6fd"; + version = "0.6.2"; + sha256 = "0iaxd3ay36lbkzz19dgnb0pn6fi699afv556wkpnd8zl23p4qif3"; libraryHaskellDepends = [ base io-streams seqid ]; - homepage = "https://github.com/LukeHoersten/seqid-streams"; + homepage = "https://github.com/bitnomial/seqid-streams"; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -178954,6 +179328,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; + "sqlcli" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "sqlcli"; + version = "0.1.0.0"; + sha256 = "1xkq7pjvmhb4gc85val4fnd6jsbx7dmybq842r40vdbbxj8swh5v"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli"; + description = "Sql Call-Level Interface bindings for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "sqlcli-odbc" = callPackage + ({ mkDerivation, base, sqlcli }: + mkDerivation { + pname = "sqlcli-odbc"; + version = "0.1.0.1"; + sha256 = "176jz0y435rdg1cg03a9aa2jd1a26gi5id9d3fbm91wv6fyjj6lm"; + libraryHaskellDepends = [ base sqlcli ]; + homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc"; + description = "Specific ODBC definitions to be used by SQL CLI clients"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sqlite" = callPackage ({ mkDerivation, base, bytestring, directory, pretty, sqlite, time , utf8-string @@ -179067,8 +179465,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.1.1.1"; - sha256 = "09cxxg780vy9hjaaybs402gcbajlla6yv84c5zyxl6kbp7apr6la"; + version = "0.1.1.2"; + sha256 = "1kfdyy6an151ans0p4xk102fjgn23hqsgyy05izb4z3mzahk6qij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179084,6 +179482,7 @@ self: { homepage = "https://github.com/morphismtech/squeal"; description = "Squeal PostgreSQL Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "squeeze" = callPackage @@ -180129,6 +180528,7 @@ self: { homepage = "https://github.com/4e6/stackage2nix#readme"; description = "Convert Stack files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "staf" = callPackage @@ -182804,8 +183204,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "0.9.1.0"; - sha256 = "0yhdfwvw15b1srjkmjafxjgpxcxwjqpdg4r5681cc9s4dqrhhgxw"; + version = "0.9.3.0"; + sha256 = "107kyi11634r7iqx0n6ry60byjab3xigl0xf3waq0lrv7jgrmhbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183847,8 +184247,8 @@ self: { }: mkDerivation { pname = "swagger-test"; - version = "0.2.3"; - sha256 = "0hs1ylml6bjqmy697fhrbm83s7y5c2bz1zy8y1drvjms1lrlipgs"; + version = "0.2.4"; + sha256 = "1rm001vwhl648xhb02jr6c72q8klx4wigk9kz2lw9ipkz2pra15a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183864,6 +184264,7 @@ self: { homepage = "https://github.com/rodrigosetti/swagger-test"; description = "Testing of Swagger APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger2" = callPackage @@ -184642,6 +185043,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-core" = callPackage @@ -184790,6 +185192,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sys-auth-smbclient" = callPackage @@ -195943,14 +196346,14 @@ self: { "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, criterion, hspec - , text + , QuickCheck, text }: mkDerivation { pname = "type-of-html"; - version = "0.2.1.1"; - sha256 = "1dvmpi1bal10vr5l4phllwxij9yw5lgjyx7aimb1yalri2dapipk"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec text ]; + version = "0.3.0.0"; + sha256 = "1cj0q9h7dda8zmn8lnvm0scn97cfwxihvj31x28nzfywgbhimhv6"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base blaze-html bytestring criterion text ]; @@ -196181,6 +196584,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typed-process_0_1_1" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring + , conduit, conduit-extra, exceptions, hspec, http-conduit, process + , stm, temporary, transformers + }: + mkDerivation { + pname = "typed-process"; + version = "0.1.1"; + sha256 = "1n93jy1z2xyin8j5dy972hdv2ydwfdbf5x1bygvn8cc6llb4wsml"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra exceptions process stm + transformers + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring conduit conduit-extra hspec + http-conduit temporary + ]; + homepage = "https://haskell-lang.org/library/typed-process"; + description = "Run external processes, with strong typing of streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -196961,10 +197387,10 @@ self: { ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { pname = "unagi-streams"; - version = "0.2.2"; - sha256 = "1v38007ldhwapwxqx5znl0ygl1fi2bhr4vg707ifw1f0wxxw154a"; + version = "0.2.3"; + sha256 = "1nhv6wbaw9knryq4rsb3y0k5kvhzb9ivkh9vjkvw4rccjikabc9a"; libraryHaskellDepends = [ base io-streams unagi-chan ]; - homepage = "https://github.com/LukeHoersten/unagi-streams"; + homepage = "https://github.com/bitnomial/unagi-streams"; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -199911,6 +200337,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_0_5_5" = callPackage + ({ mkDerivation, base, bifunctors, directory, doctest, filepath + , lens, mtl, QuickCheck, semigroupoids, semigroups + , template-haskell, transformers + }: + mkDerivation { + pname = "validation"; + version = "0.5.5"; + sha256 = "0fgwgpwcisbabzyq11pkj57gp0kydi4px9gmgzqcq2hn6xb43qkd"; + libraryHaskellDepends = [ + base bifunctors lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/validation"; + 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 @@ -203363,6 +203810,7 @@ self: { executableHaskellDepends = [ base bytestring cryptonite memory ]; homepage = "https://github.com/habibalamin/wai-secure-cookies"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session" = callPackage @@ -207357,6 +207805,7 @@ self: { homepage = "http://github.com/tych0/xcffib"; description = "A cffi-based python binding for X"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xchat-plugin" = callPackage @@ -209908,16 +210357,15 @@ self: { "yeshql" = callPackage ({ mkDerivation, base, containers, convertible, filepath, HDBC - , parsec, stm, syb-with-class, tasty, tasty-hunit, tasty-quickcheck + , parsec, stm, tasty, tasty-hunit, tasty-quickcheck , template-haskell }: mkDerivation { pname = "yeshql"; - version = "3.0.0.1"; - sha256 = "1qlx0wpcf6dms7q8rkdj41az01d7yywi2j8khi36k4r298l2g4v5"; + version = "3.0.1.1"; + sha256 = "07swxkxjdvsgsfz9qanygv1fmp3vzcd18hffyp0m6c7qv4av7zps"; libraryHaskellDepends = [ - base containers convertible filepath HDBC parsec syb-with-class - template-haskell + base containers convertible filepath HDBC parsec template-haskell ]; testHaskellDepends = [ base HDBC stm tasty tasty-hunit tasty-quickcheck @@ -210057,6 +210505,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_19" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, memory + , mime-mail, network-uri, nonce, persistent, persistent-template + , random, resourcet, safe, shakespeare, template-haskell, text + , time, transformers, unordered-containers, wai, yesod-core + , yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.19"; + sha256 = "1r6ykh9q9080wrshicmgxkjjlxb1rxv56kabqnyx44xihhcr19jp"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-conduit http-types lifted-base memory + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -210851,6 +211329,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_4_16" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.16"; + sha256 = "0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: mkDerivation { diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 60076455dae..7169d09e412 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -151,12 +151,12 @@ let sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig ''; - meta = { - license = stdenv.lib.licenses.ruby; - homepage = http://www.ruby-lang.org/en/; + meta = with stdenv.lib; { description = "The Ruby language"; - maintainers = with stdenv.lib.maintainers; [ vrthra manveru ]; - platforms = stdenv.lib.platforms.all; + homepage = http://www.ruby-lang.org/en/; + license = licenses.ruby; + maintainers = with maintainers; [ vrthra manveru ]; + platforms = platforms.all; }; passthru = rec { diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index 7658c303a1e..99870e6ba2c 100644 --- a/pkgs/development/interpreters/ruby/rubygems-src.nix +++ b/pkgs/development/interpreters/ruby/rubygems-src.nix @@ -1,6 +1,6 @@ { fetchurl -, version ? "2.6.10" -, sha256 ? "364c0eee8e0c9e8ab4879c5035832e5a27f0c97292d2264af5ae0020585280f0" +, version ? "2.6.13" +, sha256 ? "1j98ww8cz9y4wwshg7p4i4acrmls3ywkyj1nlkh4k3bywwm50hfh" }: fetchurl { url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index fe4e7907c9f..61932b29e62 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, openblas, libpng, libjpeg +, guiSupport ? false, libX11 +}: stdenv.mkDerivation rec { - version = "19.4"; + version = "19.6"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4"; + sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds"; }; + postPatch = '' + rm -rf dlib/external + ''; + enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openblas libpng libjpeg ] ++ lib.optional guiSupport libX11; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix deleted file mode 100644 index fee0f868ea9..00000000000 --- a/pkgs/development/libraries/v8/3.14.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args: -with stdenv.lib; -let - version = "3.14.5.10"; - sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; -in -(callPackage ./generic.nix (args // { - inherit version sha256; -})).overrideDerivation (oldAttrs:{ - patchPhase = [ - oldAttrs.patchPhase - "sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8" - ]; - - # http://code.google.com/p/v8/issues/detail?id=2149 - NIX_CFLAGS_COMPILE = concatStringsSep " " [ - oldAttrs.NIX_CFLAGS_COMPILE - "-Wno-unused-local-typedefs" - "-Wno-aggressive-loop-optimizations" - ]; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = "${version}"; - inherit sha256; - }; -}) diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix new file mode 100644 index 00000000000..53718f696cb --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.17.nix @@ -0,0 +1,106 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls +, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit +, libidn, libedit, readline, mesa, libintlOrEmpty +, enableGeoLocation ? true, geoclue2, sqlite +, gst-plugins-base, gst-plugins-bad +}: + +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.17.91"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = http://webkitgtk.org/; + license = licenses.bsd2; + platforms = with platforms; linux ++ darwin; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + postConfigure = optionalString stdenv.isDarwin '' + substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "" + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libbmalloc.a" "" + sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ + Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ + Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ + Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" + ''; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "0f158gqb2lvv3v5z6s7gjgwms69fgsjkd8whfks8cq6cybiy9y37"; + }; + + # see if we can clean this up.... + + patches = [ + ./finding-harfbuzz-icu.patch + ./gstreamergl-2.17.patch + ] ++ optionals stdenv.isDarwin [ + ./PR-152650-2.patch + ./PR-153138.patch + ./PR-157554.patch + ./PR-157574.patch + ]; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + ] + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_INTROSPECTION=ON" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" + + (optionalString stdenv.isDarwin " -lintl"); + + nativeBuildInputs = [ + cmake perl python2 ruby bison gperf sqlite + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = libintlOrEmpty ++ [ + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit + gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]) + ++ optionals stdenv.isDarwin [ libedit readline mesa ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch new file mode 100644 index 00000000000..7c47db52aba --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch @@ -0,0 +1,13 @@ +diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake +index d3577a8..9620dc0 100644 +--- i/Source/cmake/OptionsGTK.cmake ++++ w/Source/cmake/OptionsGTK.cmake +@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential + + # Private options specific to the GTK+ port. Changing these options is + # completely unsupported. They are intended for use only by WebKit developers. +-WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON) ++WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF) + WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF) + WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON) + diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix new file mode 100644 index 00000000000..653adb3d12b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clsql-sqlite3''; + version = ''clsql-20160208-git''; + + description = ''Common Lisp Sqlite3 Driver''; + + deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; + sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + }; + + packageName = "clsql-sqlite3"; + + asdFilesToKeep = ["clsql-sqlite3.asd"]; + overrides = x: x; +} +/* (SYSTEM clsql-sqlite3 DESCRIPTION Common Lisp Sqlite3 Driver SHA256 + 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL + http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz + MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-sqlite3 FILENAME + clsql-sqlite3 DEPS + ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi) + (NAME uffi FILENAME uffi)) + DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20160208-git SIBLINGS + (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket + clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-tests + clsql-uffi clsql) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index fab5f2f5048..32ef6367e27 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -38,6 +38,7 @@ cl-smtp clsql clsql-postgresql clsql-postgresql-socket +clsql-sqlite3 clss cl+ssl cl-syntax-annot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 1047b60f1fc..22b58895747 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1941,6 +1941,17 @@ let quicklisp-to-nix-packages = rec { })); + "clsql-sqlite3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-sqlite3" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + "clsql-postgresql-socket" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clsql-postgresql-socket" or (x: {})) diff --git a/pkgs/development/ocaml-modules/cmdliner/1.0.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix index 9448610a378..e8824f31807 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1.0.nix +++ b/pkgs/development/ocaml-modules/cmdliner/0.9.nix @@ -1,33 +1,30 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; - version = "1.0.0"; + version = "0.9.8"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x"; + sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; }; unpackCmd = "tar xjf $src"; - - nativeBuildInputs = [ ocamlbuild opam topkg ]; + nativeBuildInputs = [ ocamlbuild opam ]; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ result ]; createFindlibDestdir = true; - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build - ''; - - installPhase = '' + configurePhase = "ocaml pkg/git.ml"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + installPhase = '' opam-installer --script --prefix=$out | sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index e8824f31807..2e2abe897e0 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.8"; + version = "1.0.2"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; + sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild opam ]; + + nativeBuildInputs = [ ocamlbuild opam topkg ]; buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ result ]; createFindlibDestdir = true; - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build + ''; + + installPhase = '' opam-installer --script --prefix=$out | sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix index 90255407002..e93af743619 100644 --- a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # the fix for which hasn't been merged yet. # keep Nose around since running the tests by hand is possible from Python or bash - propagatedBuildInputs = [ stdenv nose numpy numpy.blas pydot_ng scipy six ]; + propagatedBuildInputs = [ nose numpy numpy.blas pydot_ng scipy six ]; meta = { homepage = http://deeplearning.net/software/theano/; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 3e07806986b..26db071cad5 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,16 +9,16 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "36.0.1"; + version = "36.4.0"; format = "wheel"; - sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587"; + sha256 = "4d54c0bfee283e78609169213f9c075827d5837086f58b588b417b093c23464b"; }; # TODO: Shouldn't be necessary anymore for pip > 9.0.1! # https://github.com/NixOS/nixpkgs/issues/26392 # https://github.com/pypa/setuptools/issues/885 pkg_resources = fetchurl { - url = https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py; + url = "https://raw.githubusercontent.com/pypa/setuptools/v36.4.0/pkg_resources/__init__.py"; sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv"; }; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix new file mode 100644 index 00000000000..af7af221b9b --- /dev/null +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + pname = "django-multiselectfield"; + name = "${pname}-${version}"; + version = "0.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "52483d23aecbf6b502f9e6806e97da9288d5d7f2a3f99f736390763de68c8fd7"; + }; + + propagatedBuildInputs = [ django ]; + + # No tests + doCheck = false; + + meta = { + description = "django-multiselectfield"; + homepage = "https://github.com/goinnn/django-multiselectfield"; + license = lib.licenses.lgpl3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix new file mode 100644 index 00000000000..62741a78709 --- /dev/null +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, testtools +, mock +, python +}: + +buildPythonPackage rec { + pname = "fixtures"; + version = "3.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"; + }; + + propagatedBuildInputs = [ pbr testtools mock ]; + + checkPhase = '' + ${python.interpreter} -m testtools.run fixtures.test_suite + ''; + + meta = { + description = "Reusable state for writing clean tests and more"; + homepage = "https://pypi.python.org/pypi/fixtures"; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix new file mode 100644 index 00000000000..35bfd603f41 --- /dev/null +++ b/pkgs/development/python-modules/keyring/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchPypi +, secretstorage +, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm +, mock, pytest_28, pytestrunner }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "keyring"; + version = "10.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh"; + }; + + buildInputs = [ + fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm + ]; + + checkInputs = [ mock pytest_28 pytestrunner ]; + + propagatedBuildInputs = [ secretstorage ]; + + checkPhase = '' + py.test $out + ''; + + meta = with stdenv.lib; { + description = "Store and access your passwords safely"; + homepage = "https://pypi.python.org/pypi/keyring"; + license = licenses.psfl; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix new file mode 100644 index 00000000000..d9ce51eed1e --- /dev/null +++ b/pkgs/development/python-modules/logfury/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, funcsigs +, six +}: + +buildPythonPackage rec { + pname = "logfury"; + name = "${pname}-${version}"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2"; + }; + + propagatedBuildInputs = [ + funcsigs + six + ]; + + # No tests + doCheck = false; + + meta = { + description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls."; + homepage = "https://github.com/ppolewicz/logfury"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jwiegley ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix index 44b9ed70a18..4a67a3132ed 100644 --- a/pkgs/development/python-modules/protobuf.nix +++ b/pkgs/development/python-modules/protobuf.nix @@ -8,8 +8,10 @@ buildPythonPackage rec { inherit (protobuf) name src; inherit disabled doCheck; - # work around python distutils compiling C++ with $CC - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = + # work around python distutils compiling C++ with $CC + optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" + ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; propagatedBuildInputs = [ protobuf google_apputils ]; buildInputs = [ google_apputils pyext ]; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix new file mode 100644 index 00000000000..af0b64fc340 --- /dev/null +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, bleach +, docutils +, pygments +, six +}: + +buildPythonPackage rec { + pname = "readme_renderer"; + version = "17.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + bleach docutils pygments six + ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; + homepage = https://github.com/pypa/readme_renderer; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix new file mode 100644 index 00000000000..0f2ce45c885 --- /dev/null +++ b/pkgs/development/python-modules/restview/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, readme_renderer +, pygments +, mock +}: + +buildPythonPackage rec { + pname = "restview"; + name = "${pname}-${version}"; + version = "2.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec"; + }; + + propagatedBuildInputs = [ docutils readme_renderer pygments ]; + checkInputs = [ mock ]; + + postPatch = '' + # dict order breaking tests + sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py + ''; + + meta = { + description = "ReStructuredText viewer"; + homepage = http://mg.pov.lt/restview/; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ koral ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index b6bf629e746..1c6fb414a73 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "36.2.7"; + version = "36.4.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5"; + sha256 = "2758b0270fe8ceec42f336ee5b411e60dc8579febc27bb3ba9b794dc7f0239ae"; }; buildInputs = [ python wrapPython unzip ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 2ef294d8d9f..f4c74cfccf8 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -21,9 +21,12 @@ buildPythonPackage rec { sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048"; }; - buildInputs = with self; [ nose ]; + checkInputs = with self; [ nose ]; propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib]; + # Huge test suites with several test failures + doCheck = false; + meta = { description = "Statistical computations and models for use with SciPy"; homepage = https://www.github.com/statsmodels/statsmodels; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 989d8bc7003..f30aed29ba1 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }: +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.5.4"; meta = with stdenv.lib; { - homepage = https://github.com/bazelbuild/bazel/; + homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = [ maintainers.philandstuff ]; @@ -16,40 +16,38 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb"; + sha256 = "1jdb8zbgafhz2qi0ajk34845kpmfhxchdimvwkq6lkb1159v0mr1"; }; sourceRoot = "."; + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + + customBash = writeScriptBin "bash" '' + #!${stdenv.shell} + PATH="$PATH:${lib.makeBinPath [ coreutils ]}" exec ${bash}/bin/bash "$@" + ''; + postPatch = '' - for f in $(grep -l -r '#!/bin/bash'); do - substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash' - done - for f in \ - src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \ - src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \ - src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \ - src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \ - ; do - substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash + find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace /usr/bin/env ${coreutils}/bin/env done + patchShebangs . ''; buildInputs = [ - stdenv.cc - stdenv.cc.cc.lib jdk + ]; + + nativeBuildInputs = [ zip + python unzip makeWrapper which - ]; - - # These must be propagated since the dependency is hidden in a compressed - # archive. - - propagatedBuildInputs = [ - bash + customBash ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin" + wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/ cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock index cbea90ab1a9..c7f89c32c3f 100644 --- a/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rake (11.1.1) + rake (12.0.0) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.10.5 + 1.14.6 diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix index db7c987465a..f23edfd5f63 100644 --- a/pkgs/development/tools/build-managers/rake/default.nix +++ b/pkgs/development/tools/build-managers/rake/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, ruby }: bundlerEnv { - name = "rake-11.1.1"; + name = "rake-${(import ./gemset.nix).rake.version}"; inherit ruby; gemdir = ./.; diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/development/tools/build-managers/rake/gemset.nix index efea7a79dbb..d5dc29e378a 100644 --- a/pkgs/development/tools/build-managers/rake/gemset.nix +++ b/pkgs/development/tools/build-managers/rake/gemset.nix @@ -1,9 +1,10 @@ { - "rake" = { - version = "11.1.1"; + rake = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; type = "gem"; - sha256 = "0h8wcic2xh3lv7yvs05pqnfqb80jyl488f7136lgxmajb0s1rqhg"; }; + version = "12.0.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 02ff52155b1..1ee2a270b49 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -17,7 +17,7 @@ let basename = "gdb-${version}"; - version = "8.0"; + version = "8.0.1"; in assert targetPlatform.isHurd -> mig != null && hurd != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn"; + sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"; }; patches = [ ./debug-info-from-env.patch ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 26c0fe281e7..fda4e9abd45 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "0.28.4"; + version = "1.0.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "12l1ljgzk45i24d9x7036hdrb8f46in93xfc2z4wq94wzm24s2za"; + sha256 = "1adp5wzxbq5glxbmqfvmjn3vld93mvl65y4bmhjn8clzj7n25piq"; }; buildInputs = [makeWrapper nodejs]; |