jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-15 06:16:49 +00:00 committed by GitHub
commit 0e0fae3ebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 510 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/science/math/R/default.nix
View File

@ -33,7 +33,10 @@ stdenv.mkDerivation rec {
];
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"
substituteInPlace configure \
--replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \
--replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \
--replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"
'';
dontDisableStatic = static;

9
pkgs/desktops/gnome-3/core/gnome-session/default.nix
View File

@ -1,6 +1,7 @@
{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl
, fetchpatch }:
stdenv.mkDerivation rec {
pname = "gnome-session";
@ -21,6 +22,12 @@ stdenv.mkDerivation rec {
grep = "${gnugrep}/bin/grep";
bash = "${bash}/bin/bash";
})
# Fixes 2 minute delay at poweroff.
# https://gitlab.gnome.org/GNOME/gnome-session/issues/74
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff";
sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz";
})
];
mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];

555
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -21177,12 +21177,12 @@ self: {
platforms = lib.platforms.none;
}) {};
"Win32_2_11_0_0" = callPackage
"Win32_2_11_1_0" = callPackage
({ mkDerivation }:
mkDerivation {
pname = "Win32";
version = "2.11.0.0";
sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm";
version = "2.11.1.0";
sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk";
description = "A binding to Windows Win32 API";
license = lib.licenses.bsd3;
platforms = lib.platforms.none;
@ -24505,6 +24505,31 @@ self: {
license = lib.licenses.bsd3;
}) {};
"aeson-combinators_0_0_4_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, deepseq, doctest, fail, hspec, scientific, text, time
, time-compat, unordered-containers, utf8-string, uuid-types
, vector, void
}:
mkDerivation {
pname = "aeson-combinators";
version = "0.0.4.1";
sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg";
libraryHaskellDepends = [
aeson base bytestring containers fail scientific text time
time-compat unordered-containers uuid-types vector void
];
testHaskellDepends = [
aeson base bytestring doctest hspec text utf8-string
];
benchmarkHaskellDepends = [
aeson base bytestring criterion deepseq text
];
description = "Aeson combinators for dead simple JSON decoding";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"aeson-commit" = callPackage
({ mkDerivation, aeson, aeson-qq, base, mtl, tasty, tasty-hspec
, text
@ -33816,8 +33841,8 @@ self: {
pname = "asn1-encoding";
version = "0.9.6";
sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r";
revision = "1";
editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n";
revision = "2";
editedCabalFile = "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97";
libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
testHaskellDepends = [
asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
@ -33992,6 +34017,8 @@ self: {
pname = "assoc";
version = "1.0.2";
sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q";
revision = "1";
editedCabalFile = "17ycclzwnysca80frsyyb6sdd2r5p83lkgwxjjnjg6j62pvf8958";
libraryHaskellDepends = [ base bifunctors tagged ];
description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
license = lib.licenses.bsd3;
@ -47376,15 +47403,23 @@ self: {
broken = true;
}) {};
"bytestring_0_11_0_0" = callPackage
({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }:
"bytestring_0_11_1_0" = callPackage
({ mkDerivation, base, deepseq, dlist, ghc-prim, integer-gmp
, random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck
, transformers
}:
mkDerivation {
pname = "bytestring";
version = "0.11.0.0";
sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj";
revision = "1";
editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr";
version = "0.11.1.0";
sha256 = "1a29kwczd1hcpir691x936i9c5ys9d7m1lyby48djs9w54ksy1jw";
libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
testHaskellDepends = [
base deepseq dlist ghc-prim tasty tasty-hunit tasty-quickcheck
transformers
];
benchmarkHaskellDepends = [
base deepseq dlist random tasty-bench
];
description = "Fast, compact, strict and lazy byte strings with a list interface";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@ -50659,8 +50694,8 @@ self: {
}:
mkDerivation {
pname = "capnp";
version = "0.10.0.0";
sha256 = "054cy2rr2hg0brrbxff4my3q2fzr1qk7ik2xyip65dq54958ibqk";
version = "0.10.0.1";
sha256 = "1p5vx7gcswz08f790swb8pi2ckbphqr76j8gav4rvrbalscd3zvf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -57105,6 +57140,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
"cmdargs_0_10_21" = callPackage
({ mkDerivation, base, filepath, process, template-haskell
, transformers
}:
mkDerivation {
pname = "cmdargs";
version = "0.10.21";
sha256 = "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base filepath process template-haskell transformers
];
description = "Command line argument processing";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"cmdargs-browser" = callPackage
({ mkDerivation, base, bytestring, cmdargs, directory, filepath
, http-types, js-jquery, process, text, transformers, wai
@ -65315,6 +65368,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
"criterion-cmp" = callPackage
({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava
, containers, filepath, optparse-applicative, vector
}:
mkDerivation {
pname = "criterion-cmp";
version = "0.1.0.0";
sha256 = "0p9l9c89bg1n7xjdq3npvknlfb36gkvpgwhq7i0qd2g20ysdxppd";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
ansi-terminal base boxes bytestring cassava containers filepath
optparse-applicative vector
];
description = "A simple tool for comparing in Criterion benchmark results";
license = lib.licenses.bsd3;
}) {};
"criterion-compare" = callPackage
({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams
, clay, colour, containers, data-default, filepath, lens, lucid
@ -73617,8 +73688,8 @@ self: {
pname = "dhall";
version = "1.38.0";
sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229";
revision = "1";
editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r";
revision = "2";
editedCabalFile = "13ppbn4kcrfls9fm9sqjwa4hb4nj8q6fqfxj3a62vck7qc1rbvn0";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@ -73660,6 +73731,8 @@ self: {
pname = "dhall-bash";
version = "1.0.36";
sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0";
revision = "1";
editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -73703,8 +73776,8 @@ self: {
pname = "dhall-docs";
version = "1.0.4";
sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl";
revision = "2";
editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z";
revision = "3";
editedCabalFile = "116m74khdfx57ghrid1myqyj8acrhzhnjzjmxnsn3yghdan29797";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@ -73770,8 +73843,8 @@ self: {
pname = "dhall-json";
version = "1.7.5";
sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy";
revision = "1";
editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn";
revision = "2";
editedCabalFile = "0181ma0qzkcfg4g5fcyivmjfn542m9cmq74r6hxilfjvfzhk7fqw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -73821,8 +73894,8 @@ self: {
pname = "dhall-lsp-server";
version = "1.0.13";
sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak";
revision = "2";
editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k";
revision = "3";
editedCabalFile = "19c902vjdnikwma21gjggpc7x9sjdqbirksqw85f1n9jkrbya375";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -73965,6 +74038,8 @@ self: {
pname = "dhall-yaml";
version = "1.2.5";
sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf";
revision = "1";
editedCabalFile = "034rykrnmsnc9v9hsblkzjp26b8wv265sd31gwhqxy2358y4s33h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -74669,6 +74744,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
"diagrams-solve_0_1_3" = callPackage
({ mkDerivation, base, deepseq, tasty, tasty-hunit
, tasty-quickcheck
}:
mkDerivation {
pname = "diagrams-solve";
version = "0.1.3";
sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base deepseq tasty tasty-hunit tasty-quickcheck
];
description = "Pure Haskell solver routines used by diagrams";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"diagrams-svg" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, colour
, containers, diagrams-core, diagrams-lib, filepath, hashable
@ -85732,17 +85824,23 @@ self: {
"evdev" = callPackage
({ mkDerivation, base, bytestring, c2hs, containers, extra
, libevdev, monad-loops, time, unix
, filepath-bytestring, libevdev, monad-loops, rawfilepath, tasty
, tasty-hunit, tasty-quickcheck, time, unix
}:
mkDerivation {
pname = "evdev";
version = "2.0.0.1";
sha256 = "0ryq50g7z70rnv07pnvwssl0qrvhbljkq9yk1z8gj9kvqdsw9cmg";
version = "2.1.0";
sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3";
libraryHaskellDepends = [
base bytestring containers extra monad-loops time unix
base bytestring containers extra filepath-bytestring monad-loops
rawfilepath time unix
];
libraryPkgconfigDepends = [ libevdev ];
libraryToolDepends = [ c2hs ];
testHaskellDepends = [
base bytestring containers extra filepath-bytestring monad-loops
rawfilepath tasty tasty-hunit tasty-quickcheck time unix
];
description = "Bindings to libevdev";
license = lib.licenses.bsd3;
}) {inherit (pkgs) libevdev;};
@ -85755,6 +85853,8 @@ self: {
pname = "evdev-streamly";
version = "0.0.1.0";
sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp";
revision = "1";
editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj";
libraryHaskellDepends = [
base bytestring containers evdev extra posix-paths rawfilepath
streamly streamly-fsnotify unix
@ -86722,8 +86822,8 @@ self: {
}:
mkDerivation {
pname = "exh";
version = "1.0.0";
sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l";
version = "1.0.2";
sha256 = "10pvr8ya2f7arp8cqi4g97dpqin1h8n0xmnihqszchcils0v2ayn";
libraryHaskellDepends = [
aeson base bytestring conduit containers html-conduit http-client
in-other-words language-javascript megaparsec optics-core optics-th
@ -101493,6 +101593,23 @@ self: {
license = lib.licenses.bsd2;
}) {};
"ghc-typelits-natnormalise_0_7_4" = callPackage
({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
, integer-gmp, tasty, tasty-hunit, template-haskell, transformers
}:
mkDerivation {
pname = "ghc-typelits-natnormalise";
version = "0.7.4";
sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp";
libraryHaskellDepends = [
base containers ghc ghc-tcplugins-extra integer-gmp transformers
];
testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
license = lib.licenses.bsd2;
hydraPlatforms = lib.platforms.none;
}) {};
"ghc-typelits-presburger" = callPackage
({ mkDerivation, base, containers, equational-reasoning, ghc
, ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
@ -102176,17 +102293,17 @@ self: {
"ghcprofview" = callPackage
({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk
, haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text
, haskell-gi-base, mtl, regex-tdfa, scientific, text
}:
mkDerivation {
pname = "ghcprofview";
version = "0.1.0.0";
sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a";
version = "0.1.0.1";
sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa
regex-tdfa-text scientific text
aeson base containers ghc-prof gi-gtk haskell-gi-base mtl
regex-tdfa scientific text
];
description = "GHC .prof files viewer";
license = lib.licenses.bsd3;
@ -105553,8 +105670,8 @@ self: {
}:
mkDerivation {
pname = "gltf-codec";
version = "0.1.0.2";
sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh";
version = "0.1.0.3";
sha256 = "0kgkzskn2k9zgihrb1v9xy5yfjlggmpj15g1bdgx7faipksaa3fb";
libraryHaskellDepends = [
aeson base base64-bytestring binary bytestring scientific text
unordered-containers vector
@ -115796,8 +115913,8 @@ self: {
}:
mkDerivation {
pname = "happstack-authenticate";
version = "2.4.1";
sha256 = "1166ccqpjwr331chf7hi4n42m2frahpf93ardfjgv8x6d0p5pfss";
version = "2.4.1.1";
sha256 = "164pjybk054a3h3ydfakzibngpmp8a4cbzg0sip9slfb739nz25j";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state aeson authenticate base base64-bytestring boomerang
@ -118337,6 +118454,8 @@ self: {
pname = "haskell-language-server";
version = "0.9.0.0";
sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm";
revision = "1";
editedCabalFile = "0cnvijjjfps2cwh0m1lyn1mnx33p6jfjs42z1xx5z8z1a05xsnn1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -120179,14 +120298,14 @@ self: {
"haskellish" = callPackage
({ mkDerivation, base, containers, haskell-src-exts, mtl
, template-haskell
, template-haskell, text
}:
mkDerivation {
pname = "haskellish";
version = "0.2.3.1";
sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0";
version = "0.2.4";
sha256 = "0hj96lkqglsq66iaglqdd5gwks2arzi41ljw0izybypxccd5q46i";
libraryHaskellDepends = [
base containers haskell-src-exts mtl template-haskell
base containers haskell-src-exts mtl template-haskell text
];
description = "For parsing Haskell-ish languages";
license = lib.licenses.bsd3;
@ -120666,8 +120785,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
version = "0.42.2";
sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0";
version = "0.45.0";
sha256 = "1mnpgj0d5f3ad4m66zsr4kyp5cdjcryabpkrnnv8s173nd9zksr6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -120711,8 +120830,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store-data";
version = "0.42.1";
sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva";
version = "0.44.0";
sha256 = "03v5dbka4cz3z4f6qcpbhjv2r8c5x5a8iw24apc6agzir5q5zza8";
libraryHaskellDepends = [
aeson base bytestring cereal containers data-default deepseq
hashable haskoin-core http-client http-types lens mtl network
@ -127749,23 +127868,23 @@ self: {
"hinit" = callPackage
({ mkDerivation, base, Cabal, containers, directory, exceptions
, fused-effects, generic-lens, Glob, haskeline, lens, megaparsec
, mustache, optparse-applicative, parser-combinators, path, path-io
, fused-effects, Glob, haskeline, megaparsec, mustache, optics-core
, optparse-applicative, parser-combinators, path, path-io
, prettyprinter, prettyprinter-ansi-terminal, process
, quickcheck-text, spdx-license, string-interpolate, text, time
, tomland
}:
mkDerivation {
pname = "hinit";
version = "0.2.0";
sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v";
version = "0.2.1";
sha256 = "10lhx18g50f24l867kjqgb2qpky3vvx7w7s4sc3pidr3hc0ams3g";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base Cabal containers directory exceptions fused-effects
generic-lens Glob haskeline lens megaparsec mustache
optparse-applicative parser-combinators path path-io prettyprinter
base Cabal containers directory exceptions fused-effects Glob
haskeline megaparsec mustache optics-core optparse-applicative
parser-combinators path path-io prettyprinter
prettyprinter-ansi-terminal process spdx-license string-interpolate
text time tomland
];
@ -150702,6 +150821,22 @@ self: {
license = lib.licenses.mit;
}) {};
"jira-wiki-markup_1_3_3" = callPackage
({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
mkDerivation {
pname = "jira-wiki-markup";
version = "1.3.3";
sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl parsec text ];
executableHaskellDepends = [ base text ];
testHaskellDepends = [ base parsec tasty tasty-hunit text ];
description = "Handle Jira wiki markup";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"jmacro" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
, haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec
@ -161365,8 +161500,8 @@ self: {
({ mkDerivation, base, bytestring, libtelnet }:
mkDerivation {
pname = "libtelnet";
version = "0.1.0.0";
sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc";
version = "0.1.0.1";
sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ];
@ -166236,8 +166371,8 @@ self: {
}:
mkDerivation {
pname = "lsp";
version = "1.0.0.1";
sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1";
version = "1.1.0.0";
sha256 = "0jfpcih4xxzikagxvns3jyiqi9aw2m6hp55gpmzpf53mvpkcs7ws";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -166311,27 +166446,27 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
"lsp-test_0_12_0_0" = callPackage
"lsp-test_0_13_0_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
, bytestring, conduit, conduit-parse, containers, data-default
, Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl
, parser-combinators, process, text, transformers, unix
, Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl
, parser-combinators, process, some, text, time, transformers, unix
, unordered-containers
}:
mkDerivation {
pname = "lsp-test";
version = "0.12.0.0";
sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd";
version = "0.13.0.0";
sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async base bytestring conduit
conduit-parse containers data-default Diff directory filepath Glob
haskell-lsp lens mtl parser-combinators process text transformers
unix unordered-containers
lens lsp-types mtl parser-combinators process some text time
transformers unix unordered-containers
];
testHaskellDepends = [
aeson base data-default directory filepath haskell-lsp hspec lens
aeson base data-default directory filepath hspec lens lsp-types
text unordered-containers
];
description = "Functional test framework for LSP servers";
@ -166341,20 +166476,20 @@ self: {
"lsp-types" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, containers
, data-default, deepseq, dependent-sum-template, directory
, filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay
, scientific, some, template-haskell, temporary, text
, unordered-containers
, data-default, deepseq, dependent-sum, dependent-sum-template
, directory, filepath, hashable, hslogger, lens, network-uri
, rope-utf16-splay, scientific, some, template-haskell, temporary
, text, unordered-containers
}:
mkDerivation {
pname = "lsp-types";
version = "1.0.0.1";
sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27";
version = "1.1.0.0";
sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54";
libraryHaskellDepends = [
aeson base binary bytestring containers data-default deepseq
dependent-sum-template directory filepath hashable hslogger lens
network-uri rope-utf16-splay scientific some template-haskell
temporary text unordered-containers
dependent-sum dependent-sum-template directory filepath hashable
hslogger lens network-uri rope-utf16-splay scientific some
template-haskell temporary text unordered-containers
];
description = "Haskell library for the Microsoft Language Server Protocol, data types";
license = lib.licenses.mit;
@ -174941,6 +175076,33 @@ self: {
license = lib.licenses.bsd3;
}) {};
"modern-uri_0_3_4_0" = callPackage
({ mkDerivation, base, bytestring, containers, contravariant
, criterion, deepseq, exceptions, hspec, hspec-discover
, hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
, reflection, tagged, template-haskell, text, weigh
}:
mkDerivation {
pname = "modern-uri";
version = "0.3.4.0";
sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk";
libraryHaskellDepends = [
base bytestring containers contravariant deepseq exceptions
megaparsec mtl profunctors QuickCheck reflection tagged
template-haskell text
];
testHaskellDepends = [
base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
base bytestring criterion deepseq megaparsec text weigh
];
description = "Modern library for working with URIs";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"modify-fasta" = callPackage
({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
, pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@ -182877,8 +183039,6 @@ self: {
];
description = "An MQTT Protocol Implementation";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"net-mqtt-lens" = callPackage
@ -182895,8 +183055,6 @@ self: {
];
description = "Optics for net-mqtt";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"net-mqtt-rpc" = callPackage
@ -182918,8 +183076,6 @@ self: {
];
description = "Make RPC calls via an MQTT broker";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"net-spider" = callPackage
@ -199906,6 +200062,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
"pipes-bytestring_2_1_7" = callPackage
({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
, stringsearch, transformers
}:
mkDerivation {
pname = "pipes-bytestring";
version = "2.1.7";
sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc";
libraryHaskellDepends = [
base bytestring pipes pipes-group pipes-parse stringsearch
transformers
];
description = "ByteString support for pipes";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"pipes-bzip" = callPackage
({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib
, data-default, directory, hspec, MonadRandom, mtl, pipes
@ -200566,6 +200739,18 @@ self: {
license = lib.licenses.bsd3;
}) {};
"pipes-parse_3_0_9" = callPackage
({ mkDerivation, base, pipes, transformers }:
mkDerivation {
pname = "pipes-parse";
version = "3.0.9";
sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3";
libraryHaskellDepends = [ base pipes transformers ];
description = "Parsing infrastructure for the pipes ecosystem";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"pipes-postgresql-simple" = callPackage
({ mkDerivation, async, base, bytestring, exceptions, mtl, pipes
, pipes-concurrency, pipes-safe, postgresql-simple, stm, text
@ -200674,6 +200859,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
"pipes-safe_2_3_3" = callPackage
({ mkDerivation, base, containers, exceptions, monad-control, mtl
, pipes, primitive, transformers, transformers-base
}:
mkDerivation {
pname = "pipes-safe";
version = "2.3.3";
sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab";
libraryHaskellDepends = [
base containers exceptions monad-control mtl pipes primitive
transformers transformers-base
];
description = "Safety for the pipes ecosystem";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"pipes-shell" = callPackage
({ mkDerivation, async, base, bytestring, directory, hspec, pipes
, pipes-bytestring, pipes-safe, process, stm, stm-chans, text
@ -225392,16 +225594,16 @@ self: {
, containers, crackNum, deepseq, directory, doctest, filepath
, gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random
, silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
, template-haskell, time, transformers, uniplate, z3
, template-haskell, text, time, transformers, uniplate, z3
}:
mkDerivation {
pname = "sbv";
version = "8.9";
sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51";
version = "8.10";
sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array async base containers crackNum deepseq directory filepath mtl
pretty process QuickCheck random syb template-haskell time
pretty process QuickCheck random syb template-haskell text time
transformers uniplate
];
testHaskellDepends = [
@ -225412,7 +225614,7 @@ self: {
testSystemDepends = [ z3 ];
benchmarkHaskellDepends = [
base bench-show containers crackNum deepseq directory filepath
gauge mtl process random silently syb time
gauge mtl process random silently syb text time
];
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
license = lib.licenses.bsd3;
@ -231717,14 +231919,39 @@ self: {
license = lib.licenses.mit;
}) {};
"serversession_1_0_2" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, containers, data-default, hashable, hspec, nonce, path-pieces
, persistent-test, QuickCheck, text, time, transformers
, unordered-containers
}:
mkDerivation {
pname = "serversession";
version = "1.0.2";
sha256 = "02ynhgq6gn5ddx2yd8ns8ay0rrhzln2h6jrmnwk7x1fqqfvzx0jf";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring data-default hashable nonce
path-pieces persistent-test text time transformers
unordered-containers
];
testHaskellDepends = [
aeson base base64-bytestring bytestring containers data-default
hspec nonce path-pieces QuickCheck text time transformers
unordered-containers
];
description = "Secure, modular server-side sessions";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"serversession-backend-acid-state" = callPackage
({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy
, serversession, unordered-containers
}:
mkDerivation {
pname = "serversession-backend-acid-state";
version = "1.0.3";
sha256 = "1rkw5an7lwx05063caqjhvf449jxij2zrbymg64p600mngb1flq0";
version = "1.0.4";
sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z";
libraryHaskellDepends = [
acid-state base containers mtl safecopy serversession
unordered-containers
@ -231748,8 +231975,8 @@ self: {
}:
mkDerivation {
pname = "serversession-backend-persistent";
version = "1.0.4";
sha256 = "074pxfv1yj6ffxp4bg0ia20w7ikdja3g3k1l93nnjcni13zddwn7";
version = "1.0.5";
sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cereal path-pieces
persistent serversession tagged text time transformers
@ -231774,8 +232001,8 @@ self: {
}:
mkDerivation {
pname = "serversession-backend-redis";
version = "1.0.3";
sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf";
version = "1.0.4";
sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5";
libraryHaskellDepends = [
base bytestring hedis path-pieces serversession tagged text time
transformers unordered-containers
@ -234376,8 +234603,8 @@ self: {
}:
mkDerivation {
pname = "signable";
version = "0.2";
sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s";
version = "0.3";
sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q";
libraryHaskellDepends = [
asn1-encoding asn1-types base binary bytestring casing cryptonite
memory microlens pem proto-lens proto-lens-runtime
@ -246130,8 +246357,8 @@ self: {
pname = "streamproc";
version = "1.6.2";
sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
revision = "1";
editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs";
revision = "2";
editedCabalFile = "1j3frdzhlvmggqq07b7kiz6h7mim64n2frsb2d3hzsjd7jym526j";
libraryHaskellDepends = [ base ];
description = "Stream Processer Arrow";
license = lib.licenses.bsd3;
@ -246569,6 +246796,35 @@ self: {
license = lib.licenses.bsd3;
}) {};
"string-interpolate_0_3_1_0" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, formatting
, haskell-src-exts, haskell-src-meta, hspec, hspec-core
, interpolate, neat-interpolation, QuickCheck, quickcheck-instances
, quickcheck-text, quickcheck-unicode, split, template-haskell
, text, text-conversions, unordered-containers, utf8-string
}:
mkDerivation {
pname = "string-interpolate";
version = "0.3.1.0";
sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d";
libraryHaskellDepends = [
base bytestring haskell-src-exts haskell-src-meta split
template-haskell text text-conversions utf8-string
];
testHaskellDepends = [
base bytestring hspec hspec-core QuickCheck quickcheck-instances
quickcheck-text quickcheck-unicode template-haskell text
unordered-containers
];
benchmarkHaskellDepends = [
base bytestring criterion deepseq formatting interpolate
neat-interpolation QuickCheck text
];
description = "Haskell string/text/bytestring interpolation that just works";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"string-isos" = callPackage
({ mkDerivation, base, bytestring, mono-traversable, safe, text
, type-iso
@ -248967,6 +249223,28 @@ self: {
broken = true;
}) {};
"swisstable" = callPackage
({ mkDerivation, base, criterion, deepseq, hashable, hashtables
, primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector
}:
mkDerivation {
pname = "swisstable";
version = "0.1.0.2";
sha256 = "0zffsavnxnwhzxgbwpqg38gnjywgfdk60hbg0wvpggk1zaw0ylr1";
libraryHaskellDepends = [ base hashable primitive vector ];
testHaskellDepends = [
base hashable primitive QuickCheck tasty tasty-discover tasty-hunit
vector
];
testToolDepends = [ tasty-discover ];
benchmarkHaskellDepends = [
base criterion deepseq hashable hashtables primitive QuickCheck
vector
];
description = "SwissTable hash map";
license = lib.licenses.bsd3;
}) {};
"sws" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
, containers, cryptonite, directory, filepath, hourglass
@ -257180,6 +257458,8 @@ self: {
pname = "these";
version = "1.1.1.1";
sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p";
revision = "1";
editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9";
libraryHaskellDepends = [ assoc base binary deepseq hashable ];
description = "An either-or-both data type";
license = lib.licenses.bsd3;
@ -258200,6 +258480,8 @@ self: {
pname = "time-compat";
version = "1.9.5";
sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii";
revision = "1";
editedCabalFile = "1f6r8cyfgzpfg9nrsqbf99pi44fyds9wcmgwxb4s0zmlb5dbv1m5";
libraryHaskellDepends = [ base base-orphans deepseq time ];
testHaskellDepends = [
base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
@ -260178,6 +260460,38 @@ self: {
license = lib.licenses.mpl20;
}) {};
"tomland_1_3_2_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog
, hspec-megaparsec, markdown-unlit, megaparsec, mtl
, parser-combinators, text, time, transformers
, unordered-containers, validation-selective
}:
mkDerivation {
pname = "tomland";
version = "1.3.2.0";
sha256 = "0yj39mh4z3v3jqri38s3ylrglv657g3m7gqr2rz8ydlvx2draknc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers deepseq hashable megaparsec mtl
parser-combinators text time transformers unordered-containers
validation-selective
];
executableHaskellDepends = [
base bytestring containers hashable text time unordered-containers
];
executableToolDepends = [ markdown-unlit ];
testHaskellDepends = [
base bytestring containers directory hashable hedgehog hspec
hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time
unordered-containers
];
description = "Bidirectional TOML serialization";
license = lib.licenses.mpl20;
hydraPlatforms = lib.platforms.none;
}) {};
"tomlcheck" = callPackage
({ mkDerivation, base, htoml-megaparsec, megaparsec
, optparse-applicative, text
@ -265802,6 +266116,32 @@ self: {
license = lib.licenses.bsd3;
}) {};
"ua-parser_0_7_6_0" = callPackage
({ mkDerivation, aeson, base, bytestring, criterion, data-default
, deepseq, file-embed, filepath, HUnit, pcre-light, tasty
, tasty-hunit, tasty-quickcheck, text, yaml
}:
mkDerivation {
pname = "ua-parser";
version = "0.7.6.0";
sha256 = "0sakvmmf6p2ca0dbkwqdj5cv93gp78srw0zc4f1skcgndkmxwk6l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring data-default file-embed pcre-light text yaml
];
testHaskellDepends = [
aeson base bytestring data-default file-embed filepath HUnit
pcre-light tasty tasty-hunit tasty-quickcheck text yaml
];
benchmarkHaskellDepends = [
aeson base bytestring criterion data-default deepseq file-embed
filepath pcre-light text yaml
];
description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"uacpid" = callPackage
({ mkDerivation, base, containers, directory, filepath, hslogger
, mtl, network, process, regex-compat, time, time-locale-compat
@ -269794,8 +270134,8 @@ self: {
pname = "uuid";
version = "1.3.13";
sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
revision = "3";
editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq";
revision = "5";
editedCabalFile = "0hv9xrs6n005cid9laxbimyg5cxywvcd0fh8pyadqqvk3b8zlj9d";
libraryHaskellDepends = [
base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
network-info random text time uuid-types
@ -269914,8 +270254,8 @@ self: {
pname = "uuid-types";
version = "1.0.3";
sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj";
revision = "3";
editedCabalFile = "0znx08r25sgs5j7ix8i9aikhgad0kc9i6vgkg0g3jzxk5haal9sf";
revision = "4";
editedCabalFile = "0ipwfd5y8021ygpadjjhchw5irm0x27dlv1k2hf4znza5v7hadcn";
libraryHaskellDepends = [
base binary bytestring deepseq hashable random text
];
@ -271609,8 +271949,8 @@ self: {
}:
mkDerivation {
pname = "vega-view";
version = "0.3.1.6";
sha256 = "0s9d3g47qnzcpi2p1z60axrr53jbc6q4qyma88qxsrf6ava115ar";
version = "0.3.1.7";
sha256 = "1181gfxyxf2m3m23xg89kmmp8aizrm9sm908ydbkw885idh2k5x0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@ -282839,6 +283179,23 @@ self: {
broken = true;
}) {inherit (pkgs) libdevil;};
"yasi" = callPackage
({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover
, tasty-hedgehog, tasty-hunit, template-haskell, text
}:
mkDerivation {
pname = "yasi";
version = "0.1.1.1";
sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k";
libraryHaskellDepends = [ base bytestring template-haskell text ];
testHaskellDepends = [
base hedgehog tasty tasty-hedgehog tasty-hunit text
];
testToolDepends = [ tasty-discover ];
description = "Yet another string interpolator";
license = lib.licenses.cc0;
}) {};
"yate" = callPackage
({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific
, template-haskell, text, unordered-containers, vector

16
pkgs/development/interpreters/racket/default.nix
View File

@ -8,6 +8,7 @@
, libGL
, libGLU
, libjpeg
, ncurses
, libpng, libtool, mpfr, openssl, pango, poppler
, readline, sqlite
, disableDocs ? false
@ -46,7 +47,7 @@ in
stdenv.mkDerivation rec {
pname = "racket";
version = "7.9"; # always change at once with ./minimal.nix
version = "8.0"; # always change at once with ./minimal.nix
src = (lib.makeOverridable ({ name, sha256 }:
fetchurl {
@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
}
)) {
name = "${pname}-${version}";
sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m";
sha256 = "0lqqpa88v0br93qw7450a4blyi3pwn7sq2k04h0ikbsqrdnfj7lj";
};
FONTCONFIG_FILE = fontsConf;
@ -68,12 +69,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cacert wrapGAppsHook ];
buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ncurses ];
preConfigure = ''
unset AR
for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do
substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname
for f in src/lt/configure src/cs/c/configure src/bc/src/string.c src/ChezScheme/workarea; do
substituteInPlace "$f" \
--replace /usr/bin/uname ${coreutils}/bin/uname \
--replace /bin/cp ${coreutils}/bin/cp \
--replace /bin/ln ${coreutils}/bin/ln \
--replace /bin/rm ${coreutils}/bin/rm \
--replace /bin/true ${coreutils}/bin/true
done
mkdir src/build
cd src/build

2
pkgs/development/interpreters/racket/minimal.nix
View File

@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia";
sha256 = "0qvfi6rg9cwzh716q5j7m30rqq9xysi6zsalqlpdqrzhnx8y54k0";
};
meta = oldAttrs.meta // {

2
pkgs/development/libraries/fmt/default.nix
View File

@ -37,7 +37,7 @@ let
homepage = "http://fmtlib.net/";
downloadPage = "https://github.com/fmtlib/fmt/";
maintainers = [ maintainers.jdehaas ];
license = licenses.bsd2;
license = licenses.mit;
platforms = platforms.all;
};
};

2
pkgs/development/libraries/opencl-headers/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Khronos OpenCL headers version ${version}";
homepage = "https://www.khronos.org/registry/cl/";
license = licenses.mit;
license = licenses.asl20;
platforms = platforms.unix;
};
}

20
pkgs/os-specific/linux/zfs/default.nix
View File

@ -28,7 +28,7 @@ let
, extraPatches ? []
, rev ? "zfs-${version}"
, isUnstable ? false
, incompatibleKernelVersion ? null }:
, kernelCompatible ? null }:
stdenv.mkDerivation {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
@ -183,7 +183,7 @@ let
platforms = platforms.linux;
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
broken = if
buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion
buildKernel && (kernelCompatible != null) && !kernelCompatible
then builtins.trace ''
Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
@ -196,22 +196,22 @@ in {
# ./nixos/modules/tasks/filesystems/zfs.nix needs
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = "4.20";
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11";
# this package should point to the latest release.
version = "2.0.2";
version = "2.0.3";
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs=";
};
zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = "4.19";
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11";
# this package should point to a version / git revision compatible with the latest kernel release
version = "2.0.2";
version = "2.0.3";
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs=";
};
}

28
pkgs/servers/rippled/validator-keys-tool.nix
View File

@ -1,33 +1,35 @@
{ stdenv, lib, fetchgit, cmake, openssl, boost, zlib, rippled }:
{ stdenv, lib, fetchFromGitHub, cmake, openssl, boost, zlib, icu, rippled }:
stdenv.mkDerivation rec {
name = "rippled-validator-keys-tool-20180927-${builtins.substring 0 7 rev}";
rev = "d7774bcc1dc9439c586ea1c175fcd5ff3960b15f";
pname = "rippled-validator-keys-tool";
version = "0.3.2";
src = fetchgit {
url = "https://github.com/ripple/validator-keys-tool.git";
inherit rev;
sha256 = "1hcbwwa21n692qpbm0vqy5jvvnf4aias309610m4kwdsnzfw0902";
src = fetchFromGitHub {
owner = "ripple";
repo = "validator-keys-tool";
rev = "5d7efcfeda3bdf6f5dda78056004a7c326321e9b";
sha256 = "1irm8asp6plk9xw3ksf4fqnim8h0vj3h96w638lx71pga1h4zvmy";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl boost zlib rippled ];
buildInputs = [ openssl boost zlib icu rippled ];
hardeningDisable = ["format"];
preConfigure = ''
export CXX="$(command -v $CXX)"
export CC="$(command -v $CC)"
'';
cmakeFlags = [
"-Dep_procs=1"
];
installPhase = ''
runHook preInstall
install -D validator-keys $out/bin/validator-keys
runHook postInstall
'';
meta = with lib; {
description = "Generate master and ephemeral rippled validator keys";
homepage = "https://github.com/ripple/validator-keys-tool";
maintainers = with maintainers; [ offline ];
maintainers = with maintainers; [ offline rmcgibbo ];
license = licenses.isc;
platforms = [ "x86_64-linux" ];
};

2
pkgs/tools/misc/piston-cli/default.nix
View File

@ -1,6 +1,6 @@
{ lib, python3Packages }:
python3Packages.buildPythonPackage rec {
python3Packages.buildPythonApplication rec {
pname = "piston-cli";
version = "1.2.1";

6
pkgs/top-level/all-packages.nix
View File

@ -18420,13 +18420,11 @@ in
# Fails to compile with boost >= 1.72
rippled = callPackage ../servers/rippled {
boost = boost171;
boost = boost17x;
};
rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
boost = boost167.override {
enableStatic = true;
};
boost = boost17x;
};
roon-server = callPackage ../servers/roon-server { };