diff options
Diffstat (limited to 'pkgs')
65 files changed, 2869 insertions, 392 deletions
diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 1a9cd2a12525..cf461c498c1c 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0i01pj71p3lc1kcqj6mixax6865vbxd9k9jczi2xh4p9nmfa5m2a"; + sha256 = "1n8nkrydic2zkglz9hyrf28np3v42b4xwia068b29szivr9fmnrn"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 4e1e505e035e..aacf71e17b6c 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh"; + sha256 = "1f573shf0qv1kh0sb9sljagpb2q1rn8h7qc1hxlb5nlchs9qcnnn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 24fed4ca8521..f10a88ec9614 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "newsboat-${version}"; - version = "2.11.1"; + version = "2.12"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"; + sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv"; }; prePatch = '' diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 49cd81ac923c..334c50814d78 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha -, auth0ClientID, auth0Domain, disableTooltips }: +, auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; }; - patches = [ ./isDev.patch ] - ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; + patches = [ ./isDev.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index a601db8c8da5..b6e9c9210251 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,14 +1,13 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" -, disableTooltips ? false }: +, auth0Domain ? "nixpkgs.auth0.com" }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain disableTooltips; + inherit auth0ClientID auth0Domain; }; sencha = callPackage ./sencha {}; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch deleted file mode 100644 index 5ddaa9d51771..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- index.html.orig 2017-12-16 20:06:03.401298402 +0300 -+++ ./index.html 2017-12-16 20:06:21.474484436 +0300 -@@ -43,14 +43,14 @@ - <!--- Localization --> - - <!--- Tooltip player --> -- <script type='text/javascript'> -+ <!--<script type='text/javascript'> - (function(d, s){ - var t = d.createElement(s), e = d.getElementsByTagName(s)[0]; - t.type = "text/javascript"; e.parentNode.insertBefore(t, e); - t.async = "async"; - t.src = "https://cdn.tooltip.io/static/player.js?apiKey=sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2"; - })(document, "script"); -- </script> -+ </script>--> - <!--- Tooltip player --> - </head> - <body> diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 46157178fc1a..ca82f30e2d1f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.3"; + version = "6.5.3.6"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 2ae58721188e..33ccec355117 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180512"; + version = "20180622"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl"; + sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180512 so we disable them for now. + # that has tests (20180223) as well as 20180622 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index b139f30b3d18..0f0c6aaf74da 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -8,7 +8,7 @@ , enableDocs ? false }: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.3"; name = "openmvg-${version}"; src = fetchgit { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Tag v1.1 rev = "refs/tags/v${version}"; - sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f"; + sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9a4ef524dde9..24da6a71c580 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -95,6 +95,8 @@ rec { git-stree = callPackage ./git-stree { }; + git-sync = callPackage ./git-sync { }; + git2cl = callPackage ./git2cl { }; gitFastExport = callPackage ./fast-export { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix new file mode 100644 index 000000000000..7ba7d8ec2434 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +}: + +stdenv.mkDerivation rec { + name = "git-sync-${version}"; + version = "20151024"; + + src = fetchFromGitHub { + owner = "simonthum"; + repo = "git-sync"; + rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; + sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a git-sync $out/bin/git-sync + ''; + + wrapperPath = with stdenv.lib; makeBinPath [ + coreutils + git + gnugrep + gnused + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/git-sync \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "A script to automatically synchronize a git repository"; + homepage = https://github.com/simonthum/git-sync; + maintainers = with stdenv.lib.maintainers; [ imalison ]; + license = stdenv.lib.licenses.cc0; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a60368e5c6dc..d25a165e40c4 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/db00b74891fcaae598fdcaf3835e274be8f2c082.tar.gz"; - sha256 = "0csvwqnvyg2jg76rr4blm4hm6max10a6as4mnwdz76sliw4092sg"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/dc7b5d4f0ee056ec87a4a5069b3c68bdd316abd6.tar.gz"; + sha256 = "0llycqa2y6ng5bhzb19ya6p83k0chfycpivg9287gzsmj363j934"; } diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 4d2f3894f178..0f5a43d57eda 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows @@ -49,7 +49,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO @@ -74,7 +75,7 @@ let targetCC = builtins.head toolsForTarget; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "8.4.3"; name = "${targetPrefix}ghc-${version}"; @@ -208,4 +209,8 @@ stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ccd72ef55a2..43e6473fc241 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -50,7 +50,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO @@ -166,10 +167,10 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - hardeningDisable = [ "format" ]; - checkTarget = "test"; + hardeningDisable = [ "format" ]; + postInstall = '' for bin in "$out"/lib/${name}/bin/*; do isELF "$bin" || continue diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index b847a67e7e3f..a6fb61198176 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -78,6 +78,10 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) @@ -86,9 +90,6 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 708e471bd4ac..458ad7db8efd 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -122,6 +122,10 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) @@ -133,9 +137,6 @@ in stdenv.mkDerivation rec { "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20a908858e9c..b196b1a9ccd1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -61,6 +61,10 @@ self: super: { statistics = dontCheck super.statistics; vector-builder = dontCheck super.vector-builder; + # These packages (and their reverse deps) cannot be built with profiling enabled. + ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; + ghc-datasize = disableLibraryProfiling super.ghc-datasize; + # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -1035,7 +1039,7 @@ self: super: { vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; # Builds only with the latest version of indexed-list-literals. - vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override { + vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override { indexed-list-literals = self.indexed-list-literals_0_2_1_1; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index db453e66c679..1e48971b6fbe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -39,23 +39,7 @@ self: super: { unix = null; xhtml = null; - ## Shadowed: - - ## Needs bump to a versioned attribute - ## Issue: https://github.com/sol/doctest/issues/189 - doctest = overrideCabal super.doctest_0_15_0 (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.11.3 - doCheck = false; - }); - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## Cabal <2.2 - ## Older versions don't compile. + doctest = dontCheck super.doctest_0_16_0; # tests depend on very recent QuickCheck hackage-db = super.hackage-db_2_0_1; ## Needs bump to a versioned attribute diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 55cd821e1a2c..cc143df86607 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17338,6 +17338,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "StrictCheck" = callPackage + ({ mkDerivation, base, bifunctors, containers, deepseq + , generics-sop, HUnit, QuickCheck, template-haskell + }: + mkDerivation { + pname = "StrictCheck"; + version = "0.1.0"; + sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z"; + libraryHaskellDepends = [ + base bifunctors containers generics-sop QuickCheck template-haskell + ]; + testHaskellDepends = [ + base deepseq generics-sop HUnit QuickCheck + ]; + description = "StrictCheck: Keep Your Laziness In Check"; + license = stdenv.lib.licenses.mit; + }) {}; + "StringUtils" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -18539,8 +18557,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.11"; - sha256 = "0ggcp3sgqv1m5xs8q87c2n6rms7mypbf3j9f5702qllzyns2r79l"; + version = "0.1.2.12"; + sha256 = "16cakg1vyq7sfjqpbv02a44p6bf35qqidwbc07dpnaafp2qndppf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -21358,8 +21376,8 @@ self: { pname = "ad"; version = "4.3.5"; sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; - revision = "3"; - editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5"; + revision = "4"; + editedCabalFile = "0n1r7ylnabfcd3x88j93r3fjbz8hdlp3hda0zaw7h5cawc7zy01j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -23057,14 +23075,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "alarmclock_0_5_0_1" = callPackage + "alarmclock_0_5_0_2" = callPackage ({ mkDerivation, async, base, clock, hspec, stm, time , unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.5.0.1"; - sha256 = "0l357h9admskcqap4dq5niafpvr1dkf3wvrw166rd2568dp061a6"; + version = "0.5.0.2"; + sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -23386,6 +23404,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "algolia" = callPackage + ({ mkDerivation, aeson, aeson-iproute, attoparsec, base, bytestring + , cryptonite, data-has, exceptions, hashable, http-client + , http-client-tls, http-types, iproute, memory, mtl, retry + , scientific, tasty, tasty-discover, tasty-hunit, text, time + , unordered-containers, uri-templater, vector + }: + mkDerivation { + pname = "algolia"; + version = "0.1.0.0"; + sha256 = "1gasyh2hv38i4936p4shmqmdxr06n785nydbxhaljrwwzih5mh3p"; + libraryHaskellDepends = [ + aeson aeson-iproute attoparsec base bytestring cryptonite data-has + exceptions hashable http-client http-client-tls http-types iproute + memory mtl retry scientific text time unordered-containers + uri-templater vector + ]; + testHaskellDepends = [ + aeson base tasty tasty-discover tasty-hunit + ]; + description = "A client implementing the Algolia search API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "align" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -30229,25 +30271,23 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filemanip, hashable - , http-client, http-client-tls, lzma, microlens, microlens-th, mtl + , dependency, dhall, directory, file-embed, filemanip, filepath + , hashable, http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.10.2.2"; - sha256 = "080wkmv04zdzm86zrmgvyyfv7gkjxfr1fwy9470vviy7hywh1xin"; - revision = "1"; - editedCabalFile = "02wam77mcbknvfx8hb0d9d8m9ppvrd1w3xklwky5fz2dv071alm3"; + version = "2.11.0.1"; + sha256 = "03x204zmkj5ir3dfr1cc57k5gk1zdijgcdhrnq4wpnmrciqzx0js"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip hashable http-client http-client-tls lzma - microlens microlens-th mtl parallel-io process shake shake-ats + file-embed filemanip filepath hashable http-client http-client-tls + lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext tar text unix zip-archive zlib ]; libraryToolDepends = [ cpphs ]; @@ -33529,8 +33569,8 @@ self: { }: mkDerivation { pname = "bdcs-api"; - version = "0.1.2"; - sha256 = "117688c8b3j32if2xc2dw9845jgpv7fxbkq3dhc56hqjlliha0fr"; + version = "0.1.3"; + sha256 = "1pjcbw7z79bvmyik6ykjha388gdcjb2h1bf3csc2yjy1g87qmq05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36551,8 +36591,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; - revision = "4"; - editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl"; + revision = "5"; + editedCabalFile = "012qycmsfz5l6y82d3zgjmp1k3pgvhlpjdk6rwlpc1wlfbpdqiaw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -37662,6 +37702,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bloodhound_0_16_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , errors, exceptions, hashable, hspec, http-client, http-types + , microlens, microlens-aeson, mtl, network-uri, pretty-simple + , QuickCheck, quickcheck-arbitrary-template, quickcheck-properties + , scientific, semigroups, semver, temporary, text, time + , transformers, unix-compat, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.16.0.0"; + sha256 = "0g4x2g0qmwgfrz39iwwagrr7p19fmmz1fpfk29bkmvqvbfvsjgqz"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers exceptions hashable + http-client http-types mtl network-uri scientific semigroups semver + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers errors exceptions hspec + http-client http-types microlens microlens-aeson mtl network-uri + pretty-simple QuickCheck quickcheck-arbitrary-template + quickcheck-properties semigroups semver temporary text time + unix-compat unordered-containers vector + ]; + description = "Elasticsearch client library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bloodhound-amazonka-auth" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bloodhound, exceptions, http-client @@ -38532,8 +38601,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "4"; - editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx"; + revision = "5"; + editedCabalFile = "02xvpawr73xq11lwkj1rp96h3pgpgcp693gawc3wn5zksrr0986i"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -40062,6 +40131,8 @@ self: { pname = "bytes"; version = "0.15.4"; sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm"; + revision = "1"; + editedCabalFile = "1ijk1d47rr4kyi3hl03v1xpb08k87wjr07d8i6gj5glhzfmmwp9k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -43828,8 +43899,10 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.2"; - sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1"; + version = "0.1.1.3"; + sha256 = "0bdja5sgqv2zn7fm2cxrghs808zzx1r4wn67ln7inycjy998w2xg"; + revision = "1"; + editedCabalFile = "0m85l44fc779z9v0qwq1dj23ljkrwcd483qv9ycxdyfqwaz83a5i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44212,6 +44285,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cfenv" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , raw-strings-qq + }: + mkDerivation { + pname = "cfenv"; + version = "0.1.0.0"; + sha256 = "0zklgqkm33n8a2pq8h313xij4nvrv0brh7v4q024bglyam1ndscc"; + libraryHaskellDepends = [ aeson base bytestring containers ]; + testHaskellDepends = [ + aeson base containers hspec raw-strings-qq + ]; + description = "A library getting the environment when running on Cloud Foundry"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cfipu" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , dequeue, mtl @@ -45828,8 +45917,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.1"; - sha256 = "0wgmzygjwyb6djlmxj9k7ffwp60jf3lai8jki525r4as5rggyypi"; + version = "1.0.0.2"; + sha256 = "1ibwjry5xmf8dr8wbfdw3mzq4cz9dy5kvxy4sqkshcc08kjm2kp5"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -45842,8 +45931,8 @@ self: { ({ mkDerivation, base, cl3, hmatrix }: mkDerivation { pname = "cl3-hmatrix-interface"; - version = "1.0.0.0"; - sha256 = "0cz1pzbnxld2kpiqggln0yags46zhlc8pzghz3mykblwdvgk7z7s"; + version = "1.0.0.1"; + sha256 = "1fixwb8y2v0zwww6p08rwsq7wfz63aj3zv2yjs9z0rp2xm3mq67w"; libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = stdenv.lib.licenses.bsd3; @@ -45854,8 +45943,8 @@ self: { ({ mkDerivation, base, cl3, linear }: mkDerivation { pname = "cl3-linear-interface"; - version = "1.0.0.0"; - sha256 = "02yyajy8n9j7jd3kz2qas4h2vyv5b42jrjj092cy18lfj9hr22as"; + version = "1.0.0.1"; + sha256 = "1i4f9xxsdzba49h1dv8x14zz1bv1zamhvw2ngi5d6a17qd11g319"; libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = stdenv.lib.licenses.bsd3; @@ -49005,8 +49094,8 @@ self: { pname = "comonad"; version = "5.0.3"; sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; - revision = "2"; - editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry"; + revision = "3"; + editedCabalFile = "062482gwrjc9njqsb239p391bk0s8j39a5xqv5k7rl9ijaxxlfmv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -51363,10 +51452,10 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, vector }: mkDerivation { pname = "constaparser"; - version = "0.1.0.0"; - sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + version = "0.1.0.1"; + sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a constant length"; + description = "Parse ByteStrings of a prescribed length"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53051,8 +53140,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.5.1"; - sha256 = "01kknyznwyxd5cgw9q21wmzykl1yiava0s1y3vrrdxzvixk1f89l"; + version = "3.6.0"; + sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -53193,7 +53282,7 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; - "cql-io_1_0_0" = callPackage + "cql-io_1_0_1" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, monad-control, mtl @@ -53203,8 +53292,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "1.0.0"; - sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx"; + version = "1.0.1"; + sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable HsOpenSSL iproute lens @@ -54853,6 +54942,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "csa" = callPackage + ({ mkDerivation, base, hedgehog, hmatrix, tasty, tasty-hedgehog + , tasty-hspec + }: + mkDerivation { + pname = "csa"; + version = "0.1.0"; + sha256 = "0jnhn4lgj5l466c31h2lwslnal3ypk3ma2j75zw0ghjf35i07qvr"; + libraryHaskellDepends = [ base hmatrix ]; + testHaskellDepends = [ + base hedgehog hmatrix tasty tasty-hedgehog tasty-hspec + ]; + description = "Connection-set algebra (CSA) library"; + license = "GPL"; + }) {}; + "cse-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -55571,6 +55676,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "currencies_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "currencies"; + version = "0.2.0.0"; + sha256 = "16c4m6px6kvdr8v2k5gspjn3xag69ki6yf6ij2b3ii5rlpa94wpv"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + description = "Currencies representation, pretty printing and conversion"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "currency" = callPackage ({ mkDerivation, base, containers, hashable, iso3166-country-codes }: @@ -56146,16 +56264,14 @@ self: { , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network , network-uri, old-time, parsec, process, QuickCheck, random , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm - , tar, temporary, terminfo, test-framework, test-framework-hunit + , tar, terminfo, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time, transformers, unix , unix-compat, utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.14.0"; - sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr"; - revision = "1"; - editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h"; + version = "2.14.1"; + sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -56165,8 +56281,8 @@ self: { containers cryptohash data-ordlist directory fgl filepath graphviz hashable haskeline html HTTP mmap mtl network network-uri old-time parsec process random regex-applicative regex-compat-tdfa sandi stm - tar temporary terminfo text time transformers unix unix-compat - utf8-string vector zip-archive zlib + tar terminfo text time transformers unix unix-compat utf8-string + vector zip-archive zlib ]; librarySystemDepends = [ curl ]; executableHaskellDepends = [ base ]; @@ -60498,8 +60614,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.1"; - sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67"; + version = "1.0.2"; + sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -60618,6 +60734,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "detour-via-sci" = callPackage + ({ mkDerivation, aeson, base, cassava, doctest, hlint, newtype + , scientific, siggy-chardust, template-haskell + }: + mkDerivation { + pname = "detour-via-sci"; + version = "1.0.0"; + sha256 = "1r417lp98k0nizlxh7r74c2c4g1ij33pk5ip0bm7ssmzyya127j5"; + libraryHaskellDepends = [ + aeson base cassava newtype scientific siggy-chardust + template-haskell + ]; + testHaskellDepends = [ + aeson base cassava doctest hlint newtype scientific siggy-chardust + template-haskell + ]; + description = "JSON and CSV encoding for rationals as decimal point numbers"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "detour-via-uom" = callPackage + ({ mkDerivation, aeson, base, cassava, detour-via-sci, doctest + , hlint, newtype, scientific, uom-plugin + }: + mkDerivation { + pname = "detour-via-uom"; + version = "1.0.0"; + sha256 = "07jhj5mrfkfi2l05fyax6aylq4rp0nixvpsymv2xjzvbv2pfmdq7"; + libraryHaskellDepends = [ + aeson base cassava detour-via-sci newtype scientific uom-plugin + ]; + testHaskellDepends = [ + aeson base cassava detour-via-sci doctest hlint newtype scientific + uom-plugin + ]; + description = "JSON and CSV encoding for quantities"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "detrospector" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , hashable, mwc-random, text, unordered-containers, zlib @@ -61372,8 +61527,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4.0.1"; - sha256 = "1x22fgmssbrda7iqz41y2dlc8jqkdiic72q490gm3kmxpd3xakjr"; + version = "0.4.0.2"; + sha256 = "1f4sapi4zhb3nrlq92lr309c4aarnl29bzghnmsvs1kqmimq23y0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63684,8 +63839,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "5"; - editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7"; + revision = "6"; + editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -64323,7 +64478,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_15_0" = callPackage + "doctest_0_16_0" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -64331,8 +64486,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.15.0"; - sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi"; + version = "0.16.0"; + sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64650,6 +64805,8 @@ self: { pname = "dot"; version = "0.2.2"; sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3"; + revision = "1"; + editedCabalFile = "1dc8piglcvaxj0nq946xv185ynh1bk5ca0czrw25p4hji9iji0w1"; libraryHaskellDepends = [ base impure-containers text ]; description = "Data types and encoding for graphviz dot files"; license = stdenv.lib.licenses.bsd3; @@ -65909,8 +66066,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.1"; - sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9"; + version = "0.2.0.2"; + sha256 = "1ja2pxkd5mwp404lcyk3p81y41vbwds31446gkscr2qgzrc1sb7s"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -67062,6 +67219,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egyptian-fractions" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "egyptian-fractions"; + version = "0.1.0.2"; + sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv"; + libraryHaskellDepends = [ base ]; + description = "Egyptian fractions in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ehaskell" = callPackage ({ mkDerivation, base, directory, filepath, mtlparse, process , regexpr, utf8-string, yjtools @@ -71499,18 +71667,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_6_2_0" = callPackage - ({ mkDerivation, base, criterion, HUnit, monad-control, mtl - , QuickCheck, silently, test-framework, test-framework-hunit + "extensible-effects_2_6_3_0" = callPackage + ({ mkDerivation, base, criterion, doctest, HUnit, monad-control + , mtl, QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.6.2.0"; - sha256 = "1gc7packzrh405sz2v4h088knn192kq0hq6zvjab6xqxmrl6bm6f"; + version = "2.6.3.0"; + sha256 = "07syxmhyqhcbsbwwc701k5rya89pkhcjly9nrdw7mspxailbggzs"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ - base HUnit monad-control QuickCheck silently test-framework + base doctest HUnit monad-control QuickCheck silently test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; benchmarkHaskellDepends = [ @@ -71524,19 +71692,22 @@ self: { "extensible-effects-concurrent" = callPackage ({ mkDerivation, base, containers, directory, extensible-effects - , filepath, lens, logging-effect, monad-control, mtl, parallel - , process, QuickCheck, random, stm, tagged, time, transformers + , filepath, HUnit, lens, logging-effect, monad-control, mtl + , parallel, process, QuickCheck, random, stm, tagged, tasty + , tasty-discover, tasty-hunit, time, transformers }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.1.3.0"; - sha256 = "1hzl14g3s94bgnpmm3g3ypbgb66pb4m3japn1gn5z7cknxsl2xh3"; + version = "0.2.0.3"; + sha256 = "024wn3i2nxi9j4gskhjnrkqifwszfpfnn812p34krvf763vfqcn1"; libraryHaskellDepends = [ base containers directory extensible-effects filepath lens logging-effect monad-control mtl parallel process QuickCheck random stm tagged time transformers ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base extensible-effects HUnit stm tasty tasty-discover tasty-hunit + ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72534,6 +72705,8 @@ self: { pname = "fay-text"; version = "0.3.2.2"; sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; + revision = "1"; + editedCabalFile = "0zwip7arbrbz1qhjyy5synnlrvl2wica4804wkizpxr9l7acasn6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; @@ -73273,8 +73446,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.3.1"; - sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k"; + version = "0.4"; + sha256 = "0c3893jfxxihkjz9m7m25rfa8x4yfim70p8z4jsbdw6j5adgvh8b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either @@ -74964,6 +75137,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "flexible-defaults_0_0_2" = callPackage + ({ mkDerivation, base, containers, template-haskell, th-extras + , transformers + }: + mkDerivation { + pname = "flexible-defaults"; + version = "0.0.2"; + sha256 = "0r4aq6n5h9xnal535hds111vq8whzsvyc3yibmcbp7fndldd9mgk"; + libraryHaskellDepends = [ + base containers template-haskell th-extras transformers + ]; + description = "Generate default function implementations for complex type classes"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flexible-time" = callPackage ({ mkDerivation, base, bytestring, unix-time }: mkDerivation { @@ -75573,6 +75762,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fluidsynth;}; + "flux-monoid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "flux-monoid"; + version = "0.1.0.0"; + sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m"; + libraryHaskellDepends = [ base ]; + description = "A monoid for tracking changes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fmark" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils }: @@ -78921,6 +79121,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge_0_2_2" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , foundation, process, vector + }: + mkDerivation { + pname = "gauge"; + version = "0.2.2"; + sha256 = "0sv328c7906djwgzgg5nrpn4ag9zj5rqzxmrw5r1m1nnwzx8kcks"; + libraryHaskellDepends = [ + base basement deepseq directory process vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory foundation + ]; + benchmarkHaskellDepends = [ base ]; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -89038,8 +89258,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.2.0.0"; - sha256 = "0zj7gcj4a4msgnzafhy7wh5npwfc5rnn4lnmr5h33q7impws1fgz"; + version = "0.2.0.2"; + sha256 = "01nzqyk0flj4p87iin9ggvy61csvxcnby9phczahqbc0m9v5pi3h"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers vector @@ -89060,8 +89280,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.0"; - sha256 = "1246z4zz5jzwbjikkrld3j667kp26v1b135xd62r3akcplxagzd9"; + version = "0.1.2.1"; + sha256 = "1w3rzgkrdd62v734k4pap46780wz9q8fnr0apjvcdzga7h2685hs"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -95352,14 +95572,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_2" = callPackage + "haskeline_0_7_4_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.2"; - sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm"; + version = "0.7.4.3"; + sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -99284,7 +99504,7 @@ self: { license = "unknown"; }) {}; - "haxl_2_0_0_0" = callPackage + "haxl_2_0_1_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty , stm, test-framework, test-framework-hunit, text, time @@ -99292,8 +99512,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.0.0.0"; - sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy"; + version = "2.0.1.0"; + sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99576,6 +99796,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL_mixer;}; + "hbf" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , doctest, filepath, hedgehog, hedgehog-checkers, HUnit + , optparse-applicative, parsec, primitive, smallcheck, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, tasty-smallcheck + , temporary, text, transformers, vector + }: + mkDerivation { + pname = "hbf"; + version = "0.1.0.1"; + sha256 = "1vzzcxnc3zdqgc7g66imvq141cmnzi7513hczrqjbkim0iycxh8m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring deepseq filepath optparse-applicative parsec + primitive text transformers vector + ]; + executableHaskellDepends = [ + base binary bytestring deepseq filepath optparse-applicative parsec + primitive text transformers vector + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest filepath hedgehog + hedgehog-checkers HUnit optparse-applicative parsec primitive + smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit + tasty-smallcheck temporary text transformers vector + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq filepath + optparse-applicative parsec primitive text transformers vector + ]; + description = "An optimizing Brainfuck compiler and evaluator"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hblas" = callPackage ({ mkDerivation, base, blas, hspec, liblapack, primitive , storable-complex, vector @@ -100365,8 +100620,8 @@ self: { pname = "heaps"; version = "0.3.6"; sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q"; - revision = "2"; - editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in"; + revision = "3"; + editedCabalFile = "0k6wsm1hwn3vaxdvw8p7cidxg7p8zply2ig4w4qrbpyjhl6dj9x9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; @@ -107293,22 +107548,20 @@ self: { "hpack-dhall" = callPackage ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec - , interpolate, mockery, text, transformers, trifecta + , interpolate, megaparsec, mockery, text, transformers }: mkDerivation { pname = "hpack-dhall"; - version = "0.1.0"; - sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; - revision = "3"; - editedCabalFile = "02pvzwqrs163mgxdydgv6pa1gq75xav68kpjycrxgdbpag6s9ynv"; + version = "0.2.0"; + sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base dhall dhall-json hpack text transformers trifecta + aeson base dhall dhall-json hpack megaparsec text transformers ]; testHaskellDepends = [ - aeson base dhall dhall-json hpack hspec interpolate mockery text - transformers trifecta + aeson base dhall dhall-json hpack hspec interpolate megaparsec + mockery text transformers ]; description = "Dhall support for Hpack"; license = stdenv.lib.licenses.publicDomain; @@ -107736,8 +107989,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.10"; - sha256 = "14zihg4gb42kr68y73mzb7a9ryc2yi4h50n3a4v8idw17f3fdhlz"; + version = "2.4.11"; + sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112372,6 +112625,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "html-conduit_1_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.3.1"; + sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi"; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra containers + resourcet text transformers xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring containers deepseq hspec HUnit text xml-conduit + ]; + description = "Parse HTML documents using xml-conduit datatypes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "html-email-validate" = callPackage ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck , regex-pcre-builtin, text @@ -116175,8 +116449,8 @@ self: { pname = "hyphenation"; version = "0.7.1"; sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; - revision = "2"; - editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk"; + revision = "3"; + editedCabalFile = "0pphkzschnqs2xj6kdg52gg2fjsg51lv0djxin8pqqjrdnyq4igy"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -117962,8 +118236,8 @@ self: { }: mkDerivation { pname = "impure-containers"; - version = "0.4.3"; - sha256 = "003r3ppwdwndg8q84bnh299f04b88bhnxxl65nbrz9xl77lfz2y0"; + version = "0.5.0"; + sha256 = "0rwk7wsymga61192mmjj42079v209dj9gdcjpwjmji1ivxwzy13p"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -117972,7 +118246,7 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers vector ]; benchmarkHaskellDepends = [ base criterion ]; - description = "Mutable containers in haskell"; + description = "Mutable containers in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118249,6 +118523,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "indents_0_5_0_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: + mkDerivation { + pname = "indents"; + version = "0.5.0.0"; + sha256 = "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n"; + libraryHaskellDepends = [ base mtl parsec ]; + testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; + description = "indentation sensitive parser-combinators for parsec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "index-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -118548,7 +118835,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_4" = callPackage + "influxdb_1_6_0_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -118558,8 +118845,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.4"; - sha256 = "191w8f52r5qgmrsj131sx5kjqzfcrh3z4wbh2kdv9hyfp717hz2r"; + version = "1.6.0.5"; + sha256 = "1qlc5vcd6vvrbss0nckhxkn1fbq5bfjyhc75r7di14kaww02y05l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119595,8 +119882,8 @@ self: { pname = "intervals"; version = "0.8.1"; sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; - revision = "3"; - editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95"; + revision = "4"; + editedCabalFile = "1qx3q0v13l1zaln9zdk8chxpxhshbz5x0vqm0qda7d1kpv7h6a7r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -120144,6 +120431,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.3.0"; + sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -120833,6 +121146,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iso8601-duration" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , hspec, hspec-core, QuickCheck, quickcheck-instances, time + }: + mkDerivation { + pname = "iso8601-duration"; + version = "0.1.1.0"; + sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-lexing time + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + time + ]; + description = "Types and parser for ISO8601 durations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iso8601-time" = callPackage ({ mkDerivation, base, hspec, HUnit, time }: mkDerivation { @@ -121695,6 +122027,8 @@ self: { pname = "jammittools"; version = "0.5.5"; sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz"; + revision = "1"; + editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124342,8 +124676,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.5.1"; - sha256 = "0q72kjjrn6x1qr2rp6c3mhf5s3cq4pdsl917a9bflid9zmk5n30b"; + version = "0.6.0.0"; + sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -124375,8 +124709,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.1.0"; - sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1"; + version = "0.4.2.0"; + sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific semigroups @@ -129082,6 +129416,8 @@ self: { pname = "lens"; version = "4.16.1"; sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; + revision = "1"; + editedCabalFile = "12ycfzkc87fp787a5iq3k20mrfjd6b0r2d0dr7zscfd81sgw4shx"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -129159,8 +129495,8 @@ self: { pname = "lens-aeson"; version = "1.0.2"; sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; - revision = "5"; - editedCabalFile = "0z6ib6kndbk5dgzlacmdlsdjrrazj9hwnkk9ldc6flgq15ba74nr"; + revision = "6"; + editedCabalFile = "1pg5v8fnlqw1krgi3d2a03a0zkjjdv5yp5f5z6q4mlb5jldz99a8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -130979,8 +131315,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "4"; - editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3"; + revision = "5"; + editedCabalFile = "0m67chpgxwakx62n22555nr2ii1hvspqcypjdwib9c1jrpg3ss95"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -131023,6 +131359,8 @@ self: { pname = "linear-accelerate"; version = "0.6.0.0"; sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; + revision = "1"; + editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -133146,8 +133484,8 @@ self: { pname = "log-domain"; version = "0.12"; sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi"; - revision = "2"; - editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d"; + revision = "3"; + editedCabalFile = "19xc24jwfhzy3v26689sc4ma50w4ylqd378dpxphl0nrxili645z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -133436,23 +133774,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logging-effect_1_3_0" = callPackage + "logging-effect_1_3_1" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, wl-pprint-text + , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "logging-effect"; - version = "1.3.0"; - sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn"; + version = "1.3.1"; + sha256 = "0swpklfn119q08yzxn71xfb8imv5ppcvl58dr297n1sr0v2xw7sb"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base + unliftio-core ]; benchmarkHaskellDepends = [ base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text + prettyprinter text time ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; @@ -134233,8 +134572,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "2"; - editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa"; + revision = "3"; + editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -135105,8 +135444,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "6"; - editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7"; + revision = "7"; + editedCabalFile = "00wq0lnz081bcjrnsg2pvn3i08b4ssgqm92n5j0lpqlym2vm0ar8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -137555,24 +137894,24 @@ self: { "mbug" = callPackage ({ mkDerivation, base, bytestring, directory, extra, formatting - , http-client, http-client-tls, optparse-applicative, process + , http-client, http-client-tls, mtl, optparse-applicative, process , scalpel-core, tagsoup, text, time, xdg-basedir }: mkDerivation { pname = "mbug"; - version = "1.2"; - sha256 = "0rzfayssvifwb7p8m00lv8s1m5paa86nc6ndwi6ih34lhi30qcr8"; + version = "1.3"; + sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory extra formatting http-client - http-client-tls optparse-applicative process scalpel-core tagsoup - text time xdg-basedir + http-client-tls mtl optparse-applicative process scalpel-core + tagsoup text time xdg-basedir ]; executableHaskellDepends = [ base bytestring directory extra formatting http-client - http-client-tls optparse-applicative process scalpel-core tagsoup - text time xdg-basedir + http-client-tls mtl optparse-applicative process scalpel-core + tagsoup text time xdg-basedir ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; @@ -139044,6 +139383,43 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "microformats2-parser_1_0_1_8" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , base-compat, blaze-html, blaze-markup, bytestring, containers + , data-default, either, errors, hspec + , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl + , network, network-uri, options, pcre-heavy, raw-strings-qq, safe + , scotty, tagsoup, template-haskell, text, time, transformers + , unordered-containers, vector, wai-cli, wai-extra, xml-lens + , xss-sanitize + }: + mkDerivation { + pname = "microformats2-parser"; + version = "1.0.1.8"; + sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base base-compat blaze-markup bytestring + containers data-default either errors html-conduit lens-aeson + network-uri pcre-heavy safe tagsoup text time transformers + unordered-containers vector xml-lens xss-sanitize + ]; + executableHaskellDepends = [ + aeson aeson-pretty base base-compat blaze-html blaze-markup + data-default network network-uri options scotty text wai-cli + wai-extra + ]; + testHaskellDepends = [ + aeson-qq base base-compat bytestring data-default hspec + hspec-expectations-pretty-diff html-conduit mtl network-uri + raw-strings-qq template-haskell text time xml-lens + ]; + description = "A Microformats 2 parser"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microformats2-types" = callPackage ({ mkDerivation, aeson, base, data-default-class, pandoc-types , setters, text, time @@ -139759,6 +140135,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-types_0_1_0_8" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.0.8"; + sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minecraft-data" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse @@ -145700,6 +146088,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "names-th_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, template-haskell }: + mkDerivation { + pname = "names-th"; + version = "0.3.0.0"; + sha256 = "09m5zflpk1h7jwz40mijhnpbsd8qnnay1jm3lpfrvdmg49m8zqqb"; + libraryHaskellDepends = [ base containers template-haskell ]; + description = "Manipulate name strings for TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "namespace" = callPackage ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { @@ -145862,6 +146262,8 @@ self: { pname = "nanovg"; version = "0.6.0.0"; sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3"; + revision = "1"; + editedCabalFile = "1lhfsq50r9bdby7mfscw8ih3wsz2m19lr2a2z9b6diaf5kz76vij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -147079,14 +147481,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_2_7_0_0" = callPackage + "network_2_7_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit , unix }: mkDerivation { pname = "network"; - version = "2.7.0.0"; - sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1"; + version = "2.7.0.1"; + sha256 = "1n2lixpl5w8nfn66qw86xsbh3p2v9pc6mhsxhjnwxdq2jv1qs2kh"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit @@ -147333,6 +147735,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "network-conduit-tls_1_3_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , connection, data-default-class, HUnit, mtl, network + , streaming-commons, tls, transformers, unliftio-core + }: + mkDerivation { + pname = "network-conduit-tls"; + version = "1.3.2"; + sha256 = "0zxdsf7isv3l2g58vsvi8iwlrgf85v7ksa8636kr6ffycbhn1zgc"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra connection data-default-class + network streaming-commons tls transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra connection HUnit mtl + ]; + description = "Create TLS-aware network code with conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-connection" = callPackage ({ mkDerivation, base, bytestring, containers, network , network-bytestring, stm @@ -149063,8 +149486,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "non-empty-containers"; - version = "0.1.0.0"; - sha256 = "021rfs019kb3h9zz2ycdg7ia65b1hr2rlxzihcdkqywklvxvykxw"; + version = "0.1.1.0"; + sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc"; libraryHaskellDepends = [ base containers ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149157,12 +149580,12 @@ self: { }) {}; "nonemptymap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { pname = "nonemptymap"; - version = "0.0.2.0"; - sha256 = "0h08xki7z69xrni2r6l7b5wyg6sfdm0hfq2l35q50yac83srfs0v"; - libraryHaskellDepends = [ base containers ]; + version = "0.0.4.0"; + sha256 = "0rkdhbg0bps8ws20xspw98fkmbcgzfir9kk5pxwir8x6pwwbfd8h"; + libraryHaskellDepends = [ base containers semigroupoids ]; description = "A NonEmptyMap Implementation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150136,8 +150559,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "1.0.0.1"; - sha256 = "05kqrnzxhydns3iyqk1rhdgx3cyqgcskhfwa1d87hcyx0p4w51pw"; + version = "1.0.0.2"; + sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155464,16 +155887,16 @@ self: { }) {}; "parsix" = callPackage - ({ mkDerivation, base, bytestring, containers, fingertree, mtl - , parsers, prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, text, transformers + ({ mkDerivation, base, containers, fingertree, mtl, parsers + , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "parsix"; - version = "0.1.0.1"; - sha256 = "0qpn5vjgp0392nb6nirp92s2g5jxr4jcpg35j0w1mg5ym5ra4mm1"; + version = "0.1.0.2"; + sha256 = "0dg48xycw7dl3700ws9qi49i8095nqag6wr9n1jan2w2gd0vchy1"; libraryHaskellDepends = [ - base bytestring containers fingertree mtl parsers prettyprinter + base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers ]; testHaskellDepends = [ @@ -157277,6 +157700,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_4" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.4"; + sha256 = "1ygqllybclw9mm0n05vh635wbz6qlsl2yhas3fxr3xhwsrrvwfkd"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC @@ -157297,6 +157739,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_3_3" = callPackage + ({ mkDerivation, base, bytestring, convertible, dlist, HDBC + , persistable-record, relational-query, relational-query-HDBC + , text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.3.3"; + sha256 = "0m5cx6848s9vxmbrxwv3v9f3vplpayxjddn7j332k3kj3qbdgs4v"; + libraryHaskellDepends = [ + base bytestring convertible dlist HDBC persistable-record + relational-query relational-query-HDBC text-postgresql + ]; + testHaskellDepends = [ + base relational-query relational-query-HDBC text-postgresql + ]; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -161542,6 +162005,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pomaps_0_0_1_0" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, criterion + , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty + , tasty-hspec, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pomaps"; + version = "0.0.1.0"; + sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim lattices + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest Glob lattices tasty + tasty-hspec tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lattices random vector + ]; + description = "Maps and sets of partial orders"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -165830,6 +166317,8 @@ self: { pname = "protocol-buffers"; version = "2.4.10"; sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk"; + revision = "1"; + editedCabalFile = "04cv52k497nmh04pflmjrl26vlbczvm3mk4qld0zrwqxkk6v0ris"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -165838,12 +166327,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_11" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.11"; + sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; version = "2.4.10"; sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0"; + revision = "1"; + editedCabalFile = "03b3w0yawnjv5hpprkhj49s1fkj9ib03avyxgv3i9vj0n0ngbiz1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -165852,6 +166360,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_11" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.11"; + sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -170394,8 +170917,8 @@ self: { pname = "rcu"; version = "0.2.2"; sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; - revision = "2"; - editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr"; + revision = "3"; + editedCabalFile = "1qyc8jb97mfcmijn825s6mr244mx2kqvam5mm519dm6dyk8kchpa"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -172572,6 +173095,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-tdfa_1_2_3_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl + , parsec, regex-base + }: + mkDerivation { + pname = "regex-tdfa"; + version = "1.2.3.1"; + sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim mtl parsec regex-base + ]; + description = "Replaces/Enhances Text.Regex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-tdfa-pipes" = callPackage ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base , regex-tdfa @@ -173139,7 +173678,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_11_3_0" = callPackage + "relational-query_0_11_4_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -173147,8 +173686,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.11.3.0"; - sha256 = "1g7jvhp5vv17hbddc2p6j39gfg638y2b0jjky9jxrcjkww1ii16p"; + version = "0.11.4.0"; + sha256 = "0pai1x1hqk8mn7gqxjrchb7rcv5dc8q4iwiklb8w3band7jwpnf7"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -173281,6 +173820,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.6.2"; + sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: @@ -175299,8 +175854,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.4.0.0"; - sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x"; + version = "0.4.0.1"; + sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175316,13 +175871,13 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.4.0.0"; - sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj"; + version = "0.4.0.1"; + sha256 = "054f7x6d2gi3ph9iw5fs8qxyl2jwv8q93794zhdkcnyz15371piq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; executableHaskellDepends = [ base ]; - description = "Wrapper to run reactive programs written in Rhine with Gloss as backend"; + description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -177900,8 +178455,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.2"; - sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni"; + version = "1.0.3"; + sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -179567,6 +180122,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "script-monad" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client + , http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, time, unordered-containers, vector, wreq + }: + mkDerivation { + pname = "script-monad"; + version = "0.0.1"; + sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring http-client http-types lens + lens-aeson QuickCheck text time unordered-containers vector wreq + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck + ]; + description = "Transformer stack of error, reader, writer, state, and prompt monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scrobble" = callPackage ({ mkDerivation, base, containers, curl, MissingH, network , network-uri, old-locale, pureMD5, time, url @@ -180557,8 +181135,8 @@ self: { pname = "semigroupoids"; version = "5.2.2"; sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "3"; - editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4"; + revision = "4"; + editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -184341,16 +184919,16 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable - , hs2ats, language-ats, microlens, microlens-th, shake, shake-cabal + , hs2ats, language-ats, microlens, shake, shake-c, shake-cabal , shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.6"; - sha256 = "00887a8dh26w2qj5w0scivrz3qjybbkflf4s135lmrz6s5pb7l6f"; + version = "1.9.0.0"; + sha256 = "0hnqcb79ncklf9zhvl70bxfqzgd19b4vs4angyi8swzmhvpxxizj"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats - microlens microlens-th shake shake-cabal shake-ext text + microlens shake shake-c shake-cabal shake-ext text ]; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; @@ -184361,8 +184939,8 @@ self: { ({ mkDerivation, base, cdeps, shake }: mkDerivation { pname = "shake-c"; - version = "0.1.0.0"; - sha256 = "0g6lavs5y62g5dpy1pfpm2bks43kf6i4m1gb9hdrkrz1iysgl209"; + version = "0.3.0.0"; + sha256 = "1ib1090z5vrch5nbx9dyn89yxawwhz2igb0s08sqgn7lawd03vvw"; libraryHaskellDepends = [ base cdeps shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -184423,16 +185001,12 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, cdeps, composition-prelude, directory, shake - , template-haskell - }: + ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "2.12.0.0"; - sha256 = "1yvsywbszvn2vllbzbp8c9c10idaid87wv1qvhz2xq4jw2f8q38h"; - libraryHaskellDepends = [ - base cdeps composition-prelude directory shake template-haskell - ]; + version = "3.0.1.0"; + sha256 = "15n94922a4l74n65w59dj8jjpsv2vamm5lwnkii2hq6s1rpgccnm"; + libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185657,6 +186231,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gdk_x11 = null; gtk_x11 = null;}; + "siggy-chardust" = callPackage + ({ mkDerivation, base, doctest, hlint, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "siggy-chardust"; + version = "1.0.0"; + sha256 = "0hssby6mak0bq1fqv47hp6rnw51yz1kgzgsmnvh2k9jfq0y0qwwz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hlint smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Rounding rationals to significant digits and decimal places"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "sigma-ij" = callPackage ({ mkDerivation, array, base, combinat, containers , optparse-applicative, parsec2, random, time @@ -191814,6 +192405,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_2" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.2"; + sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -193209,6 +193813,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "starter_0_3_0" = callPackage + ({ mkDerivation, base, fsnotify }: + mkDerivation { + pname = "starter"; + version = "0.3.0"; + sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx"; + libraryHaskellDepends = [ base fsnotify ]; + description = "Develop applications without restarts"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -199893,17 +200509,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_1_0_1" = callPackage + "tasty_1_1_0_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.1.0.1"; - sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw"; + version = "1.1.0.2"; + sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix + stm tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; @@ -200045,6 +200662,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, temporary-rc + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.2"; + sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404"; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary-rc + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -202900,6 +203538,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-postgresql_0_0_3_1" = callPackage + ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple + , transformers, transformers-compat + }: + mkDerivation { + pname = "text-postgresql"; + version = "0.0.3.1"; + sha256 = "1s42a1mq7hz63zfpcv7bl4141vnyrsyd0ir723iph6vmsa46iqn6"; + libraryHaskellDepends = [ + base dlist transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "Parser and Printer of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-printer" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 @@ -205748,8 +206403,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.0"; - sha256 = "0nl2qpj59zavvdjbq565ls2gz4apwh2qq2jrknxsvwfl79jnf8pz"; + version = "1.9.1"; + sha256 = "0i44m49v9vxcasiacrrk6ypqan3j2qw4r9g2m99brmji9kwma2kb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208048,8 +208703,8 @@ self: { pname = "trifecta"; version = "1.7.1.1"; sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; - revision = "4"; - editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z"; + revision = "5"; + editedCabalFile = "0zlvnmzxx1ax8kx1d0z4jibjy49picz2zxknr8i6pz1gsj89bgrw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -208651,8 +209306,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "tuple-sop"; - version = "0.3.0.0"; - sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15"; + version = "0.3.1.0"; + sha256 = "0hv0fcz5sw93v1niq2r656wpkiwkg6larld7x9cwk4s98h7qvqgn"; libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; description = "functions on n-ary tuples using generics-sop"; @@ -215212,14 +215867,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_2_0" = callPackage + "vector-sized_1_0_3_0" = callPackage ({ mkDerivation, adjunctions, base, deepseq, distributive , finite-typelits, indexed-list-literals, primitive, vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.2.0"; - sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69"; + version = "1.0.3.0"; + sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx"; libraryHaskellDepends = [ adjunctions base deepseq distributive finite-typelits indexed-list-literals primitive vector @@ -215576,6 +216231,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vfr-waypoints" = callPackage + ({ mkDerivation, base, checkers, containers, fuzzy, hedgehog, lens + , monoid-subclasses, optparse-applicative, QuickCheck, tasty + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "vfr-waypoints"; + version = "0.1.0.0"; + sha256 = "0s80vnix20jcrasra5civ2apnqjrnvi2r7ry568r32fhlgag4cr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fuzzy lens monoid-subclasses + ]; + executableHaskellDepends = [ + base fuzzy lens optparse-applicative + ]; + testHaskellDepends = [ + base checkers hedgehog lens QuickCheck tasty tasty-hedgehog + tasty-hunit tasty-quickcheck transformers + ]; + description = "VFR waypoints, as published in the AIP (ERSA)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vgrep" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th , containers, directory, doctest, fingertree, generic-deriving @@ -219199,6 +219879,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "webdriver-w3c" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, containers, directory, exceptions, http-client + , http-types, JuicyPixels, lens, lens-aeson, network-uri, parsec + , QuickCheck, random, scientific, script-monad, SHA, stm, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers, uri-encode, vector, wreq + }: + mkDerivation { + pname = "webdriver-w3c"; + version = "0.0.1"; + sha256 = "0ynidfwhyarbfhiq8m284l6489ribmakx8p8gx6cz7kvh44qa1cv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + directory exceptions http-client http-types JuicyPixels lens + lens-aeson network-uri QuickCheck random scientific script-monad + SHA stm tasty tasty-expected-failure text time unordered-containers + uri-encode vector wreq + ]; + executableHaskellDepends = [ base tasty tasty-expected-failure ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers directory + exceptions http-client http-types JuicyPixels lens lens-aeson + parsec QuickCheck random scientific script-monad tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text time + unordered-containers vector wreq + ]; + description = "Bindings to the WebDriver API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "webex-teams-api" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, http-conduit @@ -228494,6 +229207,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip;}; + "zip-archive_0_3_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, pretty, process + , temporary, text, time, unix, unzip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.3"; + sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit process temporary time + unix + ]; + testToolDepends = [ unzip ]; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl @@ -228596,8 +229335,8 @@ self: { pname = "zippers"; version = "0.2.5"; sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; - revision = "2"; - editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm"; + revision = "3"; + editedCabalFile = "0y0klc2jaj611cjvmqi95dyj9yvribf9xhibn1andrz5rs6ysz3p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens profunctors semigroupoids semigroups diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4d6f426fae43..08612ad28494 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -185,8 +185,6 @@ let setupHook = ./setup-hook-cross.sh; }); in rec { - perl = perl524; - perl522 = common { version = "5.22.4"; sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms"; @@ -201,4 +199,9 @@ in rec { version = "5.26.1"; sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; }; + + perl528 = common { + version = "5.28.0"; + sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky"; + }; } diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix new file mode 100644 index 000000000000..2d31f734166e --- /dev/null +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, qtbase, libuuid, libcap, uwsgi, grantlee }: + +stdenv.mkDerivation rec { + name = "cutelyst-${version}"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "cutelyst"; + rev = "v${version}"; + sha256 = "1kfapd5dkyw02g3j4gshxl16b90xdf5vgfhqrkdzix072f7hy5sl"; + }; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ qtbase libuuid libcap uwsgi grantlee ]; + + cmakeFlags = [ + "-DPLUGIN_UWSGI=ON" + "-DPLUGIN_STATICCOMPRESSED=ON" + "-DPLUGIN_CSRFPROTECTION=ON" + "-DPLUGIN_VIEW_GRANTLEE=ON" + ]; + + preBuild = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/Cutelyst:`pwd`/EventLoopEPoll" + ''; + + postBuild = '' + unset LD_LIBRARY_PATH + ''; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --set QT_PLUGIN_PATH '${qtbase}/${qtbase.qtPluginPrefix}' + done + ''; + + meta = with lib; { + description = "C++ Web Framework built on top of Qt"; + homepage = https://cutelyst.org/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ac921227740c..ff870f525f23 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch - ++ [ ./schema-override-variable.patch ]; + ++ optionals stdenv.hostPlatform.isMusl [ + ./quark_init_on_demand.patch + ./gobject_init_on_demand.patch + ] ++ [ ./schema-override-variable.patch ]; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/development/libraries/glib/gobject_init_on_demand.patch new file mode 100644 index 000000000000..d72d0b61dca2 --- /dev/null +++ b/pkgs/development/libraries/glib/gobject_init_on_demand.patch @@ -0,0 +1,87 @@ +--- glib-source/gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 ++++ glib-source/gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 +@@ -209,6 +209,9 @@ + static gboolean type_node_is_a_L (TypeNode *node, + TypeNode *iface_node); + ++#if !defined(__GLIBC__) ++static void gobject_init (void); ++#endif + + /* --- enumeration --- */ + +@@ -2631,7 +2634,10 @@ + GTypeFlags flags) + { + TypeNode *node; +- ++ ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (type_id > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -2749,6 +2755,9 @@ + TypeNode *pnode, *node; + GType type = 0; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (parent_type > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -2804,6 +2813,9 @@ + TypeNode *pnode, *node; + GType type; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (parent_type > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -3319,6 +3331,9 @@ + { + TypeNode *node; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + + node = lookup_type_node_I (type); +@@ -4343,6 +4358,9 @@ + void + g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) + { ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + + if (debug_flags) +@@ -4361,6 +4379,9 @@ + void + g_type_init (void) + { ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + } + +@@ -4372,6 +4393,12 @@ + TypeNode *node; + GType type; + ++#if !defined(__GLIBC__) ++ static int gobject_initialized = 0; ++ if (gobject_initialized) ++ return; ++ gobject_initialized = 1; ++#endif + /* Ensure GLib is initialized first, see + * https://bugzilla.gnome.org/show_bug.cgi?id=756139 + */ diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/development/libraries/glib/quark_init_on_demand.patch new file mode 100644 index 000000000000..168086484314 --- /dev/null +++ b/pkgs/development/libraries/glib/quark_init_on_demand.patch @@ -0,0 +1,33 @@ +--- glib-source/glib/gquark.c 2016-08-17 17:20:47.000000000 +0200 ++++ glib-source/glib/gquark.c 2016-08-30 07:49:13.298234757 +0200 +@@ -57,6 +57,9 @@ + void + g_quark_init (void) + { ++ if (quark_ht) ++ return; ++ + g_assert (quark_seq_id == 0); + quark_ht = g_hash_table_new (g_str_hash, g_str_equal); + quarks = g_new (gchar*, QUARK_BLOCK_SIZE); +@@ -138,9 +141,12 @@ + return 0; + + G_LOCK (quark_global); ++#if !defined(__GLIBC__) ++ g_quark_init (); ++#endif + quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); + G_UNLOCK (quark_global); + + return quark; + } + +@@ -280,6 +286,7 @@ + GQuark quark; + gchar **quarks_new; + ++ g_quark_init (); + if (quark_seq_id % QUARK_BLOCK_SIZE == 0) + { + quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE); diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 169a4d38bb53..0e900ca9db64 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, lib , buildPlatform, hostPlatform , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, enableShared ? !stdenv.hostPlatform.useAndroidPrebuilt }: # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross @@ -23,10 +24,14 @@ stdenv.mkDerivation rec { lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h - ''; + '' + + lib.optionalString (!enableShared) '' + sed -i -e '/preload/d' Makefile.in + ''; configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static"; + ++ lib.optional enableStatic "--enable-static" + ++ lib.optional (!enableShared) "--disable-shared"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 593bb567df7d..25e55e45d1e2 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.10.0"; + version = "4.10.1"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "0bldxhcrpav04hi256fmf907gxhyck24j1p998v48zbhm6aykw94"; + sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix new file mode 100644 index 000000000000..410c60bff9f3 --- /dev/null +++ b/pkgs/development/libraries/lief/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchzip }: + +fetchzip { + url = https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz; + sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6"; + + meta = with stdenv.lib; { + description = "Library to Instrument Executable Formats"; + homepage = https://lief.quarkslab.com/; + license = [ licenses.asl20 ]; + platforms = platforms.linux; + maintainers = [ maintainers.lassulus ]; + }; +} diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index ed1052ce40a0..152d7bdc37b3 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.10.0"; + name = "mbedtls-2.11.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk"; + sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 5c42f7bc3289..0f43705c0d42 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -58,13 +58,19 @@ rec { binutils = wrapBintoolsWith { bintools = binaries; libc = targetAndroidndkPkgs.libraries; + extraBuildCommands = '' + echo "--build-id" >> $out/nix-support/libc-ldflags + ''; }; gcc = wrapCCWith { cc = binaries; bintools = binutils; libc = targetAndroidndkPkgs.libraries; - extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let + extraBuildCommands = '' + echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + '' + + lib.optionalString targetPlatform.isAarch32 (let p = targetPlatform.platform.gcc or {} // targetPlatform.parsed.abi; flags = lib.concatLists [ diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 150d8d758699..1e8ea65c73d9 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools, python3, libcxx, version, sha256 +, fullNDK ? false # set to true if you want other parts of the NDK + # that is not used by Nixpkgs like sources, + # examples, docs, or LLVM toolchains }: stdenv.mkDerivation rec { @@ -55,11 +58,14 @@ stdenv.mkDerivation rec { } cd ${pkg_path} + '' + lib.optionalString (!fullNDK) '' # Steps to reduce output size rm -rf docs sources tests # We only support cross compiling with gcc for now rm -rf toolchains/*-clang* toolchains/llvm* + '' + + '' find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 44fa961b992f..3c12e16277d9 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib, ncurses, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools +, fullNDK ? false # set to true if you want other parts of the NDK + # that is not used by Nixpkgs like sources, + # examples, docs, or LLVM toolchains }: stdenv.mkDerivation rec { @@ -49,11 +52,13 @@ stdenv.mkDerivation rec { -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } cd ${pkg_path} + '' + lib.optionalString (!fullNDK) '' # Steps to reduce output size rm -rf docs sources tests # We only support cross compiling with gcc for now rm -rf toolchains/*-clang* toolchains/llvm-* + '' + '' find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 8c42783c9780..8882bbf66474 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +, ocaml, findlib, ocamlbuild, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, utop, - which, makeWrapper, writeText, ocaml}: + which, makeWrapper, writeText +}: -buildOcaml rec { - name = "bap"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-bap-${version}"; version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; @@ -18,6 +20,11 @@ buildOcaml rec { sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; + patches = [(fetchpatch { + url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch"; + sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk"; + })]; + createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' @@ -27,7 +34,7 @@ buildOcaml rec { nativeBuildInputs = [ which makeWrapper ]; - buildInputs = [ ocaml_oasis + buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis llvm_38 utop ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 861ac8b3bc81..c6f1b6d17581 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "re is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - name = "ocaml-re-${version}"; - version = "1.7.1"; + name = "ocaml${ocaml.version}-re-${version}"; + version = "1.7.3"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw"; + sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + buildInputs = [ ocaml findlib jbuilder ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out" - + stdenv.lib.optionalString doCheck " --enable-tests"; - buildPhase = "ocaml setup.ml -build"; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + doCheck = true; + checkPhase = "jbuilder runtest"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/ocaml/ocaml-re; diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch index bb7cb71ae098..9c4224ce64c6 100644 --- a/pkgs/development/python-modules/qiskit/setup.py.patch +++ b/pkgs/development/python-modules/qiskit/setup.py.patch @@ -1,19 +1,21 @@ --- a/setup.py +++ b/setup.py -@@ -28,11 +28,11 @@ from setuptools.dist import Distribution +@@ -18,13 +18,13 @@ from setuptools.dist import Distribution requirements = [ - "IBMQuantumExperience>=1.8.29", + "IBMQuantumExperience>=1.9.2", - "matplotlib>=2.1,<2.2", - "networkx>=2.0,<2.1", - "numpy>=1.13,<1.15", - "ply==3.10", -- "scipy>=0.19,<1.1", +- "scipy>=0.19,<1.2", +- "sympy>=1.0,<1.2", +- "pillow>=4.2.1,<5.2" + "matplotlib>=2.1", + "networkx>=2.0", + "numpy>=1.13", + "ply>=3.10", + "scipy>=0.19", - "sympy>=1.0", - "pillow>=4.2.1" ++ "sympy>=1.0", ++ "pillow>=4.2.1" ] diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 0fae9fad5d14..d6cc527e6418 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fac-${version}"; - version = "1.1.0"; + version = "2.0.0"; goPackagePath = "github.com/mkchoi212/fac"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "mkchoi212"; repo = "fac"; rev = "v${version}"; - sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx"; + sha256 = "054bbiw0slz9szy3ap2sh5dy97w3g7ms27rd3ww3i1zdhvnggwpc"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix index 65ec5ded5ad5..65335497e5ff 100644 --- a/pkgs/development/tools/fac/deps.nix +++ b/pkgs/development/tools/fac/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "1b755a90bd109f170385cb3964f0abdfd3451145"; - sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8"; + rev = "0c0b382eca61a71c1eb4cb4dea2bc78aa4939d96"; + sha256 = "0chpzs542s366vv01bfhrajdrbhmrvc3gi8jhpw3xgz6wfkivcp4"; }; } { @@ -46,21 +46,21 @@ }; } { - goPackagePath = "github.com/mkchoi212/fac"; + goPackagePath = "github.com/nsf/termbox-go"; fetch = { type = "git"; - url = "https://github.com/mkchoi212/fac"; - rev = "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502"; - sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz"; + url = "https://github.com/nsf/termbox-go"; + rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; + sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; }; } { - goPackagePath = "github.com/nsf/termbox-go"; + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "21a4d435a86280a2927985fd6296de56cbce453e"; - sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] \ No newline at end of file diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 697af75a434e..3f64f4a925f1 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -18,8 +18,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "05926968f17256cae2308756835a3a24d9de437b"; - sha256 = "0s1g1yq6j6vl2bspc90bwbwp7532pcrmh8fhnz8j6yv9py927mmm"; + rev = "b592d290cff68c7abcbd7f99f41aac998e7b7916"; + sha256 = "0jwaifp9wx6lb27qj191hjm125kq3vndh5lf7ibd86x19h5zmy4c"; }; patches = [ newShellCheck ]; isLibrary = true; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 2cc63e9ecdef..d0ffa10baeca 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; - experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; + stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; }; + experimental = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; }; }; demo = { - stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; + stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.16.36" + , version ? "0.16.51" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index bb9e4fa755db..369556fd5a1c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,15 +1,19 @@ -{ stdenv, appleDerivation, autoreconfHook, targetPlatform, enableStatic ? targetPlatform.isiOS }: +{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform +, enableStatic ? targetPlatform.isiOS +, enableShared ? !targetPlatform.isiOS +}: appleDerivation { postUnpack = "sourceRoot=$sourceRoot/libiconv"; - preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isiOS '' + preConfigure = lib.optionalString stdenv.hostPlatform.isiOS '' sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - configureFlags = stdenv.lib.optionals enableStatic [ "--enable-static" "--disable-shared" ]; + configureFlags = lib.optional enableStatic "--enable-static" + ++ lib.optional (!enableShared) "--disable-shared"; - postInstall = stdenv.lib.optionalString (!enableStatic) '' + postInstall = lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib @@ -26,6 +30,6 @@ appleDerivation { ]; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index d153ef16c14e..252fe5abf49f 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile }: +{ stdenv, requireFile, targetPlatform, lib }: let requireXcode = version: sha256: let @@ -40,11 +40,11 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); -in rec { +in lib.makeExtensible (self: { xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = xcode_9_4; -} + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "9.4")}"; +}) diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index ebca738431c3..d5ed21cd9e24 100644 --- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -25,9 +25,9 @@ rec { sdk = rec { name = "ios-sdk"; type = "derivation"; - outPath = xcode + "/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk"; + outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS"; + platform = targetPlatform.xcodePlatform; version = targetPlatform.sdkVer; }; @@ -48,7 +48,10 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags - echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { inherit sdk; @@ -60,7 +63,7 @@ rec { }; } '' if ! [ -d ${sdk} ]; then - echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2 + echo "You must have version ${sdk.version} of the ${sdk.platform} sdk installed at ${sdk}" >&2 exit 1 fi ln -s ${sdk}/usr $out diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d1732af9f5eb..5e8059bb4655 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc1"; - modDirVersion = "4.18.0-rc1"; + version = "4.18-rc2"; + modDirVersion = "4.18.0-rc2"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr"; + sha256 = "04vflzj14wvvkj3lsbabsw0239y58cdd8g5kciqz1ydhdlgifpza"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index cd7733f43a48..15c3e10e1199 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -17,7 +17,6 @@ buildPhase() { # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 13e5d1b76ea6..0fe0f3d92c92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -55,6 +55,7 @@ let outputDev = if libsOnly then null else "bin"; kernel = if libsOnly then null else kernel.dev; + kernelVersion = if libsOnly then null else kernel.modDirVersion; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 778f00d2a95d..af3df245fe67 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -25,7 +25,7 @@ let nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; preConfigure = '' substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 6bb12c2c792a..0c0aa84a6bd3 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -42,6 +42,12 @@ in stdenv.mkDerivation rec { gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace udisks/udisksclient.c \ + --replace 'defined( __GNUC_PREREQ)' 1 \ + --replace '__GNUC_PREREQ(4,6)' 1 + ''; + buildInputs = [ expat libgudev libblockdev acl systemd glib libatasmart polkit ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c44d64b8fa81..6eac54ddf651 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -61,7 +61,7 @@ let # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; preConfigure = '' substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" @@ -157,7 +157,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to the latest release. version = "0.7.9"; @@ -176,7 +176,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-05-22"; @@ -199,7 +199,7 @@ in { # also remove boot.zfs.enableLegacyCrypto zfsLegacyCrypto = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-02-01"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index ad840dfd607f..646a7856788b 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -2,15 +2,26 @@ buildGoPackage rec { name = "consul-alerts-${version}"; - version = "0.3.3"; + version = "0.5.0"; rev = "v${version}"; goPackagePath = "github.com/AcalephStorage/consul-alerts"; + goDeps = ./deps.nix; + src = fetchFromGitHub { inherit rev; owner = "AcalephStorage"; repo = "consul-alerts"; - sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq"; + sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r"; + }; + + meta = with stdenv.lib; { + description = "An extendable open source continuous integration server"; + homepage = https://github.com/AcalephStorage/consul-alerts; + # As per README + platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin; + license = licenses.gpl2; + maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/pkgs/servers/monitoring/consul-alerts/deps.nix new file mode 100644 index 000000000000..6494dc61a87c --- /dev/null +++ b/pkgs/servers/monitoring/consul-alerts/deps.nix @@ -0,0 +1,34 @@ +let + mkAwsPackage = name: { + goPackagePath = "github.com/aws/aws-sdk-go/${name}"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "v1.14.13"; + sha256 = "0014b6kl3rbjhjbk7jz116wdgdls54b1bwz454pkn1snlvkj3qil"; + }; + }; +in +[ + (mkAwsPackage "") + (mkAwsPackage "aws/session") + (mkAwsPackage "aws/sns") + (mkAwsPackage "service/sns") + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + }; + }{ + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; # has no releases as of writing + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + }; + } +] diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch new file mode 100644 index 000000000000..e20acdb04a9e --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch @@ -0,0 +1,14 @@ +diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp +index acd195d..8809e4f 100644 +--- a/src/virtlyst.cpp ++++ b/src/virtlyst.cpp +@@ -340,7 +340,8 @@ bool Virtlyst::createDB() + qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); + return false; + } +- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); ++ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", ++ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); + query.bindValue(QStringLiteral(":password"), QString::fromLatin1( + CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); + if (!query.exec()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix new file mode 100644 index 000000000000..c6245f9b40d2 --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +, qtbase, libvirt, cutelyst, grantlee }: + +stdenv.mkDerivation rec { + name = "virtlyst-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "Virtlyst"; + rev = "v${version}"; + sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + }; + + nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + buildInputs = [ qtbase libvirt cutelyst grantlee ]; + + installPhase = '' + mkdir -p $out/lib + cp src/libVirtlyst.so $out/lib + cp -r ../root $out + ''; + + patches = [ ./add-admin-password-env.patch ]; + + meta = with lib; { + description = "Web interface to manage virtual machines with libvirt"; + homepage = https://github.com/cutelyst/Virtlyst; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 6c217be4ea3c..0dd65bd2478d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -14,7 +14,6 @@ in with (import ../../../lib).systems.examples; { armv7l = make armv7l-hf-multiplatform; aarch64 = make aarch64-multiplatform; x86_64-musl = make musl64; - i686-musl = make musl32; armv6l-musl = make muslpi; aarch64-musl = make aarch64-multiplatform-musl; riscv64 = make riscv64; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index e22338dbc718..2faa8ead0716 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.8"; + version = "0.4.9"; doCheck = false; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1125n5szgq7bziz3lkrhb2a2iac93ap63g2xr78ap7b9i3gxs3xh"; + sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix new file mode 100644 index 000000000000..513439989501 --- /dev/null +++ b/pkgs/tools/graphics/rocket/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase }: + +stdenv.mkDerivation rec { + name = "rocket-${version}"; + version = "2018-06-09"; + + src = fetchFromGitHub { + owner = "rocket"; + repo = "rocket"; + rev = "7bc1e9826cad5dbc63e56371c6aa1798b2a7b50b"; + sha256 = "13bdg2dc6ypk17sz39spqdlb3wai2y085bdb36pls2as2nf22drp"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + + configurePhase = ":"; + + installPhase = '' + mkdir -p $out/bin + cp -r editor/editor $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A tool for synchronizing music and visuals in demoscene productions"; + homepage = "https://github.com/rocket/rocket"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 76c60023c063..6c5bac11e738 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gringo-4.5.4-to_string.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index af6c17433f11..7dbfc90fa125 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "4.0.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2"; + sha256 = "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr"; }; dontBuild = true; diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix new file mode 100644 index 000000000000..ce2a8cf6a7f3 --- /dev/null +++ b/pkgs/tools/networking/skydive/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: + +buildGoPackage rec { + name = "skydive-${version}"; + version = "0.17.0"; + goPackagePath = "github.com/skydive-project/skydive"; + + src = fetchFromGitHub { + owner = "skydive-project"; + repo = "skydive"; + rev = "v${version}"; + sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv"; + }; + + patchPhase = '' + substituteInPlace Makefile \ + --replace ".proto: builddep" ".proto: " \ + --replace ".bindata: builddep" ".bindata: " + ''; + + buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ]; + goDeps = ./deps.nix; + + preBuild = '' + make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version} + ''; + + preInstall = '' + mkdir -p $out/share/skydive + cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/ + ''; + + postInstall = '' + rm $bin/bin/snort + ''; + + meta = { + homepage = http://skydive.network; + description = "A real-time network analyzer"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.lewo ]; + }; +} diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix new file mode 100644 index 000000000000..c573a7231bb6 --- /dev/null +++ b/pkgs/tools/networking/skydive/deps.nix @@ -0,0 +1,1335 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "fff283ad5116362ca252298cfc9b95828956d85d"; + sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "fd18e053af8a4ff11039269006e8037ff374ce0e"; + sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b"; + sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/abbot/go-http-auth"; + fetch = { + type = "git"; + url = "https://github.com/abbot/go-http-auth"; + rev = "ca62df34b58d26b6a064246c21c0a18f97813173"; + sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n"; + }; + } + { + goPackagePath = "github.com/araddon/gou"; + fetch = { + type = "git"; + url = "https://github.com/araddon/gou"; + rev = "0c2ab7394d785afff14c983fedce4be70ccc431f"; + sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; + sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; + sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; + }; + } + { + goPackagePath = "github.com/cenk/hub"; + fetch = { + type = "git"; + url = "https://github.com/cenk/hub"; + rev = "11382a9960d39b0ecda16fd01c424c11ff765a34"; + sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm"; + }; + } + { + goPackagePath = "github.com/cenk/rpc2"; + fetch = { + type = "git"; + url = "https://github.com/cenk/rpc2"; + rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2"; + sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8"; + }; + } + { + goPackagePath = "github.com/cnf/structhash"; + fetch = { + type = "git"; + url = "https://github.com/cnf/structhash"; + rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc"; + sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "30d10be492927e2dcae0089c374c455d42414fcb"; + sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; + }; + } + { + goPackagePath = "github.com/coreos/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/coreos/bbolt"; + rev = "32c383e75ce054674c53b5a07e55de85332aee14"; + sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94"; + sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; + sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a"; + sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"; + sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "325b0804fef3a66309d962357aac3c2ce3f4d329"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88"; + sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; + sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; + sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful-swagger12"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful-swagger12"; + rev = "7524189396c68dc4b04d53852f9edc00f816b123"; + sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63"; + sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gima/govalid"; + fetch = { + type = "git"; + url = "https://github.com/gima/govalid"; + rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6"; + sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "779f45308c19820f1a69e9a4cd965f496e0da10f"; + sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "36d33bfe519efae5632669801b180bf1a245da3b"; + sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "7abd5745472fff5eb3685386d5fb8bf38683154d"; + sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; + sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + }; + } + { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c"; + sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "32dbaa12caca20fad12253c30591227e04f62cdd"; + sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "915eed3240022c5265584c55032ef1b8c8f84168"; + sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "2adc21fd136931e0388e278825291678e1d98309"; + sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "cc6329d4279e3f025a53a83c397d2339b5705c45"; + sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "67a21c4470a0598531a769727aef40b870ffa128"; + sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "41d03372f44f2bc18a72c97615a669fb60e7452a"; + sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql"; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "849a2e71dd64dbfa2bd4be110ace68881802414b"; + sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "90663712d74cb411cbef281bc1e08c19d1a76145"; + sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"; + sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "cdedf21e585dae942951e34d6defc3215b4280fa"; + sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv"; + }; + } + { + goPackagePath = "github.com/gosuri/uitable"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uitable"; + rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229"; + sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0"; + sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104"; + sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/hydrogen18/stoppableListener"; + fetch = { + type = "git"; + url = "https://github.com/hydrogen18/stoppableListener"; + rev = "dadc9ccc400c712e5a316107a5c462863919e579"; + sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; + sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/intel-go/yanff"; + fetch = { + type = "git"; + url = "https://github.com/intel-go/yanff"; + rev = "35804adce65005f76409327527e4e256569cacc6"; + sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh"; + }; + } + { + goPackagePath = "github.com/iovisor/gobpf"; + fetch = { + type = "git"; + url = "https://github.com/iovisor/gobpf"; + rev = "dd767a9fd5f868874ed117811461410100cea403"; + sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3"; + }; + } + { + goPackagePath = "github.com/jbowtie/gokogiri"; + fetch = { + type = "git"; + url = "https://github.com/jbowtie/gokogiri"; + rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c"; + sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "ed104f61ea4877bea08af6f759805674861e968d"; + sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88"; + sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"; + sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; + sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; + }; + } + { + goPackagePath = "github.com/juju/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/juju/webbrowser"; + rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507"; + sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "d1898390779332322e6b5ca5011da4bf249bb056"; + sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; + sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b"; + sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc"; + }; + } + { + goPackagePath = "github.com/lxc/lxd"; + fetch = { + type = "git"; + url = "https://github.com/lxc/lxd"; + rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6"; + sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19"; + sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d"; + sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3"; + }; + } + { + goPackagePath = "github.com/mattbaird/elastigo"; + fetch = { + type = "git"; + url = "https://github.com/safchain/elastigo"; + rev = "441c1531dca50a19990385930149f6785f78fe59"; + sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; + sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda"; + sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn"; + }; + } + { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799"; + sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/nlewo/contrail-introspect-cli"; + fetch = { + type = "git"; + url = "https://github.com/nlewo/contrail-introspect-cli"; + rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6"; + sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "8fa5343b0058459296399a89bc532aa5508de28d"; + sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943"; + sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "2973218375c3d13162e1d3afe1708aaee318ef3f"; + sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073"; + sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ff09b135c25aae272398c51a07235b90a75aa4f0"; + sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; + sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "cda20d4ac917ad418d86e151eff439648b06185b"; + sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + }; + } + { + goPackagePath = "github.com/pmylund/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/pmylund/go-cache"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568"; + sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "23070236b1ebff452f494ae831569545c2b61d26"; + sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; + sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; + }; + } + { + goPackagePath = "github.com/rogpeppe/fastuuid"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/fastuuid"; + rev = "6724a57986aff9bff1a1770e9347036def7c89f6"; + sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; + }; + } + { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "e01512671ed4c2248daf0c5e974ecf88a4947335"; + sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255"; + sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk"; + }; + } + { + goPackagePath = "github.com/skydive-project/dede"; + fetch = { + type = "git"; + url = "https://github.com/skydive-project/dede"; + rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80"; + sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf"; + }; + } + { + goPackagePath = "github.com/socketplane/libovsdb"; + fetch = { + type = "git"; + url = "https://github.com/socketplane/libovsdb"; + rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272"; + sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "a80ea588265c05730645be8342eeafeaa72b2923"; + sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "d00654080cddbd2b082acaa74007cb94a2b40866"; + sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/lebauce/viper"; + rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3"; + sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb"; + }; + } + { + goPackagePath = "github.com/tchap/zapext"; + fetch = { + type = "git"; + url = "https://github.com/tchap/zapext"; + rev = "e61c0c8823393722ae09ce0faee42fa177088a4b"; + sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr"; + }; + } + { + goPackagePath = "github.com/tebeka/selenium"; + fetch = { + type = "git"; + url = "https://github.com/tebeka/selenium"; + rev = "657e45ec600f26e76da253936c1f2adb6978ff72"; + sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"; + sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "016ba6f67a12c03708643150afcfb1509be7747a"; + sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "604eaf189ee867d8c147fafc28def2394e878d25"; + sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7"; + }; + } + { + goPackagePath = "github.com/weaveworks/tcptracer-bpf"; + fetch = { + type = "git"; + url = "https://github.com/weaveworks/tcptracer-bpf"; + rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf"; + sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "6fe8760cad3569743d51ddbb243b26f8456742dc"; + sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "e02fc20de94c78484cd5ffb007f8af96be030a45"; + sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "702b404897d4364af44dc8dcabc9815947942325"; + sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr"; + }; + } + { + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a775f18c7cfe02273500ae307b61218"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "0506d69f5564c56e25797bf7183c28921d4c6360"; + sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "35aad584952c3e7020db7b839f6b102de6271f89"; + sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a6577fac2d73be281a500b310739095313165611"; + sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "810d7000345868fc619eb81f46307107118f4ae1"; + sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; + sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7"; + sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"; + sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4"; + }; + } + { + goPackagePath = "gopkg.in/errgo.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v1"; + rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3"; + sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/httprequest.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/httprequest.v1"; + rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718"; + sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/macaroon-bakery.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon-bakery.v2"; + rev = "22c04a94d902625448265ef041bb53e715452a40"; + sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4"; + }; + } + { + goPackagePath = "gopkg.in/macaroon.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon.v2"; + rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"; + sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536"; + sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/urfave/cli.v2"; + rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1"; + sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3"; + }; + } + { + goPackagePath = "gopkg.in/validator.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/validator.v2"; + rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448"; + sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "bef53efd0c76e49e6de55ead051f886bea7e9420"; + sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad"; + sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "019ae5ada31de202164b118aee88ee2d14075c31"; + sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "35ccd4336052e7d73018b1382413534936f34eee"; + sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"; + sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa"; + }; + } +] diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index e8f8b4258721..4d4a9446b455 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180613"; + version = "0.0.20180625"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz"; + sha256 = "1z7iibydj59nzx0jcxabb9k7b6djjz6yi032n66mqr98dh4dlkb7"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 839be268b5b4..73adb0828028 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.53"; + version = "21.55"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady"; + sha256 = "005xf5j2bbalsi6z2j9q9r4zf80a04f7mz0bd2jyb8rh3lnac6w8"; }; patchPhase = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index b47f5c98c4d2..4f3795cf54c9 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.15.1"; + version = "3.16.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1vzrg6s30wc2as2s42h7a1qvyxqx26nq895r9y75aasfcwlbvnm2"; + sha256 = "0a9snxvs3fsv0gm5q9xkrcg0hwgs3c8q1rb434cnzn4qbqfnzvn7"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc2589c7538..536951081661 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1353,6 +1353,8 @@ with pkgs; languagetool = callPackage ../tools/text/languagetool { }; + lief = callPackage ../development/libraries/lief {}; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -4639,6 +4641,8 @@ with pkgs; remarshal = callPackage ../development/tools/remarshal { }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { }; rtmidi = callPackage ../development/libraries/audio/rtmidi { }; @@ -7345,7 +7349,8 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; + perl = perl524; + inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -8881,6 +8886,8 @@ with pkgs; cutee = callPackage ../development/libraries/cutee { }; + cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; + cxxtools = callPackage ../development/libraries/cxxtools { }; cwiid = callPackage ../development/libraries/cwiid { }; @@ -11679,6 +11686,8 @@ with pkgs; skalibs = callPackage ../development/libraries/skalibs { }; + skydive = callPackage ../tools/networking/skydive { }; + slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { @@ -13164,6 +13173,8 @@ with pkgs; unifiTesting; unifi = unifiStable; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a1d5772fe6da..047eab83bb42 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -44,10 +44,10 @@ in insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { + iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; - xcode = darwin.xcode_8_2; + xcode = darwin.xcode; inherit (pkgs.llvmPackages) clang-unwrapped; }; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index df462665dd16..dafa351c4e41 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -83,5 +83,6 @@ import ./. (builtins.removeAttrs args [ "system" "platform" ] // { inherit config overlays crossSystem; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. - localSystem = { system = builtins.currentSystem; } // localSystem; + localSystem = (if args ? localSystem then {} + else { system = builtins.currentSystem; }) // localSystem; }) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00689e1f5b2e..2018b5065a1c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -507,21 +507,14 @@ let self = _self // overrides; _self = with self; { sha256 = "02y2ylq83hy9kgj57sc0239x65br9sm98c0chsm61s08yc2mpiza"; }; buildInputs = [ TestMockModule ]; - }; - - ArchiveZip_1_53 = buildPerlPackage { - name = "Archive-Zip-1.60"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz; - sha256 = "eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b"; - }; meta = { description = "Provide an interface to ZIP archive files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestMockModule ]; }; + ArchiveZip_1_53 = ArchiveZip; + AudioScan = buildPerlPackage rec { name = "Audio-Scan-1.00"; src = fetchurl { @@ -4505,19 +4498,7 @@ let self = _self // overrides; _self = with self; { }; }; - DigestHMAC_SHA1 = buildPerlPackage { - name = "Digest-HMAC_SHA1-1.03"; - src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz; - sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv"; - }; - meta = { - description = "Keyed-Hashing for Message Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; - }; + DigestHMAC_SHA1 = DigestHMAC; DigestJHash = buildPerlPackage rec { name = "Digest-JHash-0.10"; @@ -9522,7 +9503,7 @@ let self = _self // overrides; _self = with self; { url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/${name}.tar.gz"; sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2"; }; - propagatedBuildInputs = [ ]; + outputs = [ "out" "dev" ]; # no "devdoc" installTargets = "install"; @@ -12083,10 +12064,13 @@ let self = _self // overrides; _self = with self; { }; PathTools = buildPerlPackage { - name = "PathTools-3.47"; + name = "PathTools-3.74"; + preConfigure = '' + substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd' + ''; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/PathTools-3.47.tar.gz; - sha256 = "caa8d4b45372b8cb0ef0f6f696efa3a60b0fd394b115cad39a7fbb8f6bd38026"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.74.tar.gz; + sha256 = "25724cc54c59a3bfabadec95e72db292c98676bf3632497384e8dc6277936e11"; }; }; @@ -13207,6 +13191,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JD/JDUNCAN/${name}.tar.gz"; sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp"; }; + meta.broken = true; }; RegexpGrammars = buildPerlModule rec { @@ -14104,6 +14089,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ArchiveZip_1_53 pkgs.file ]; + meta.broken = true; }; @@ -14123,6 +14109,7 @@ let self = _self // overrides; _self = with self; { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; + meta.broken = true; }; }; @@ -14183,20 +14170,7 @@ let self = _self // overrides; _self = with self; { }; }; - SubExporterUtil = let version = "0.987"; in buildPerlPackage { - name = "Sub-Exporter-Util-${version}"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-${version}.tar.gz"; - sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; - }; - propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ]; - meta = { - inherit version; - homepage = https://github.com/rjbs/sub-exporter; - description = "A sophisticated exporter for custom-built routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + SubExporterUtil = SubExporter; SubIdentify = buildPerlPackage rec { name = "Sub-Identify-0.14"; |