Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2020-06-07 09:25:46 +02:00
commit d0532e79ae
105 changed files with 2176 additions and 2163 deletions

View file

@ -65,6 +65,7 @@ luazip,,,,,
lua-yajl,,,,,pstn lua-yajl,,,,,pstn
luuid,,,,, luuid,,,,,
luv,,,,, luv,,,,,
lyaml,,,,,lblasc
markdown,,,,, markdown,,,,,
mediator_lua,,,,, mediator_lua,,,,,
mpack,,,,, mpack,,,,,

1 # nix name luarocks name server version luaversion maintainers
65 lua-yajl pstn
66 luuid
67 luv
68 lyaml lblasc
69 markdown
70 mediator_lua
71 mpack

View file

@ -95,9 +95,11 @@ in {
-conf ${configPath} \\ -conf ${configPath} \\
-base /var/lib/freeswitch"; -base /var/lib/freeswitch";
ExecReload = "${pkg}/bin/fs_cli -x reloadxml"; ExecReload = "${pkg}/bin/fs_cli -x reloadxml";
Restart = "always"; Restart = "on-failure";
RestartSec = "5s"; RestartSec = "5s";
CPUSchedulingPolicy = "fifo";
}; };
}; };
environment.systemPackages = [ pkg ];
}; };
} }

View file

@ -6,6 +6,7 @@
# now defaults to false because some tests can be flaky (clipboard etc) # now defaults to false because some tests can be flaky (clipboard etc)
, doCheck ? false , doCheck ? false
, nodejs ? null, fish ? null, python ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -17,6 +18,8 @@ let
nvim-client luv coxpcall busted luafilesystem penlight inspect nvim-client luv coxpcall busted luafilesystem penlight inspect
] ]
)); ));
pyEnv = python.withPackages(ps: [ ps.pynvim ps.msgpack ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neovim-unwrapped"; pname = "neovim-unwrapped";
@ -67,6 +70,13 @@ in
pkgconfig pkgconfig
]; ];
# extra programs test via `make functionaltest`
checkInputs = [
fish
nodejs
pyEnv # for src/clint.py
];
# nvim --version output retains compilation flags and references to build tools # nvim --version output retains compilation flags and references to build tools
postPatch = '' postPatch = ''

View file

@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "llpp"; pname = "llpp";
version = "31"; version = "32";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/llpp.git"; url = "git://repo.or.cz/llpp.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg"; sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y";
fetchSubmodules = false; fetchSubmodules = false;
}; };

View file

@ -17,48 +17,48 @@ index 7c278b6..41494c5 100755
-keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs"
-isfresh "$mulibs" "$(eval $keycmd)" || ( -isfresh "$mulibs" "$(eval $keycmd)" || (
- make -C "$mudir" build=$mbt -j $mjobs libs - make -C "$mudir" build=$mbt -j $mjobs libs
- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past - eval $keycmd >$mudir/build/$mbt/libmupdf.a.past
-) && vecho "fresh mupdf" -) && vecho "fresh mupdf"
- -
oincs() { oincs() {
local i= local i=
local incs1= local incs1=
@@ -90,34 +83,6 @@ mflags() { @@ -89,34 +82,6 @@ mflags() {
} }
overs="$(ocamlc -vnum 2>/dev/null)" || overs="" overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
-test "$overs" = "4.08" || { -test "$overs" = "4.10.0" || {
- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz - url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz
- txz=$outd/$(basename $url) - txz=$outd/$(basename $url)
- isfresh $txz $url || { - keycmd="printf $url; digest $txz;"
- isfresh $txz "$(eval $keycmd)" || {
- executable_p() { command -v "$1" >/dev/null 2>&1; } - executable_p() { command -v "$1" >/dev/null 2>&1; }
- if executable_p wget; then dl() { wget -q "$1" -O "$2"; } - if executable_p wget; then dl() { wget -q "$1" -O "$2"; }
- elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } - elif executable_p curl; then dl() { curl -L "$1" -o "$2"; }
- else die "no program to fetch remote urls found" - else die "no program to fetch remote urls found"
- fi - fi
- dl $url $txz - dl $url $txz
- echo "k=$url" >$txz.past - eval $keycmd >$txz.past
- } && vecho "fresh $txz" - } && vecho "fresh $txz"
- absprefix=$(cd $outd &>/dev/null; pwd -P) - absprefix=$(cd $outd &>/dev/null; pwd -P)
- export PATH=$absprefix/bin:$PATH - export PATH=$absprefix/bin:$PATH
- isfresh $absprefix/bin/ocamlc "$url" || ( - ocamlc=$absprefix/bin/ocamlc
- keycmd="printf $url; digest $ocamlc;"
- isfresh $ocamlc "$(eval $keycmd)" || (
- tar xf $txz -C $outd - tar xf $txz -C $outd
- bn=$(basename $url) - bn=$(basename $url)
- cd $outd/${bn%.tar.xz} - cd $outd/${bn%.tar.xz}
- ./configure --disable-vmthreads --disable-graph-lib \ - ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix
- --disable-ocamldoc --enable-debugger=no \
- --disable-flat-float-array \
- --prefix=$absprefix
- make -j $mjobs world - make -j $mjobs world
- make install - make install
- echo "k='$url'" >$absprefix/bin/ocamlc.past - eval $keycmd >$absprefix/bin/ocamlc.past
- ) && vecho "fresh ocamlc" - ) && vecho "fresh ocamlc"
- overs=$(ocamlc -vnum 2>/dev/null) - overs=$(ocamlc -vnum 2>/dev/null)
-} -}
bocaml1() { ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \
grep -q "$3" $outd/ordered || { { read _ c; echo $c; })}
@@ -227,7 +192,7 @@ bobjc() { @@ -230,7 +195,7 @@ bobjc() {
} && vecho "fresh $o" } && vecho "fresh $o"
} }
@ -67,7 +67,7 @@ index 7c278b6..41494c5 100755
cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do @@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do
done done
libs="str.cma unix.cma" libs="str.cma unix.cma"

View file

@ -13,12 +13,12 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.16.1"; version = "1.17.0";
pname = "mupdf"; pname = "mupdf";
src = fetchurl { src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
sha256 = "0iz4ickj52fxjp8crg573kjrl4viq279g589isdpgpckslysf7g7"; sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";
}; };
patches = patches =

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pueue"; pname = "pueue";
version = "0.5.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nukesor"; owner = "Nukesor";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; sha256 = "1n85b41kvx7x7qdizdnq1p0zrkap4gkwnnvhh4pz6j9njxj8d9ir";
}; };
cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; cargoSha256 = "0hkkz74hllc5dzmgls6bgdxsdr871df2fn51sa3shv68ah0avxff";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,4 +1,4 @@
{ stdenv, lib, meson, ninja, fetchurl { stdenv, lib, meson, ninja, fetchurl, fetchpatch
, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq";
}; };
patches = [
# compatibility with MuPDF 1.17
(fetchpatch {
url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch";
sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075";
})
];
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ buildInputs = [

View file

@ -4,7 +4,7 @@
, bzip2, flac, speex, libopus , bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy , libevent, expat, libjpeg, snappy
, libpng, libcap , libpng, libcap
, xdg_utils, yasm, minizip, libwebp , xdg_utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2, zlib , libusb1, pciutils, nss, re2, zlib
, python2Packages, perl, pkgconfig , python2Packages, perl, pkgconfig
@ -72,14 +72,14 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [ gnSystemLibraries = [
"flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "flac" "libwebp" "libxslt" "opus" "snappy" "libpng"
# "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors # "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766 # "ffmpeg" # https://crbug.com/731766
# "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source # so we can't build with one from system and other from source
]; ] ++ optional (upstream-info.channel != "dev") "yasm";
opusWithCustomModes = libopus.override { opusWithCustomModes = libopus.override {
withCustomModes = true; withCustomModes = true;
@ -89,12 +89,12 @@ let
bzip2 flac speex opusWithCustomModes bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy libevent expat libjpeg snappy
libpng libcap libpng libcap
xdg_utils yasm minizip libwebp xdg_utils minizip libwebp
libusb1 re2 zlib libusb1 re2 zlib
ffmpeg libxslt libxml2 ffmpeg libxslt libxml2
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together # harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source # so we can't build with one from system and other from source
]; ] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]);
# build paths and release info # build paths and release info
packageName = extraAttrs.packageName or extraAttrs.name; packageName = extraAttrs.packageName or extraAttrs.name;
@ -224,8 +224,9 @@ let
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
''; '';
gnFlags = mkGnFlags ({ gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") {
linux_use_bundled_binutils = false; linux_use_bundled_binutils = false;
} // {
use_lld = false; use_lld = false;
use_gold = true; use_gold = true;
gold_path = "${stdenv.cc}/bin"; gold_path = "${stdenv.cc}/bin";

View file

@ -43,6 +43,15 @@ let
sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
}; };
}); });
} // lib.optionalAttrs (channel == "dev") {
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-05-19";
src = fetchgit {
url = "https://gn.googlesource.com/gn";
rev = "d0a6f072070988e7b038496c4e7d6c562b649732";
sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
};
});
}); });
browser = callPackage ./browser.nix { inherit channel enableWideVine; }; browser = callPackage ./browser.nix { inherit channel enableWideVine; };

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9"; sha256 = "1di0fhhv6lljc2b50i0i8qx5y5xswgxz1bimpda790sb3b1xsdzx";
sha256bin64 = "0lkjl09vnj2bd1jry3awbg4z34vjnzd88p73a6x7pyrfq079l6vb"; sha256bin64 = "1f5qwx4476l4fvbw9w2i22i080bahlf83dzzpnbny7hk831g7msw";
version = "83.0.4103.61"; version = "84.0.4147.38";
}; };
dev = { dev = {
sha256 = "0f7m57acv79yzq3yg2xkchqqwisdgjv8h5xngp2i2v2md9jkfkbq"; sha256 = "07h3i4ab7yj05ndrqchzf3f9wr809qb3dj2gfc1653mkjmba8h07";
sha256bin64 = "0b0w0nwa64gf99d617idjjgrjym3qc6p9h41kn5r9j2x46lxzply"; sha256bin64 = "10jdq5mr7qby0m26l5lbsqcbh9bhjdpmpbkkcvv9wm2259rwjxr5";
version = "84.0.4143.2"; version = "85.0.4164.2";
}; };
stable = { stable = {
sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9"; sha256 = "10vg0fmwlkzpnixhhhcwccxshqdfq7rh0ribij7wgkw42bv0bi0j";
sha256bin64 = "1wji1ak6gi2a7lynxwvgpqsaz7zma9h2b9qbb5x3gzbv2dj37fmd"; sha256bin64 = "09vz7ygixs7lwlsvbby3dmc2gz0vpjwalzdh6l6apc4dngyr095k";
version = "83.0.4103.61"; version = "83.0.4103.97";
}; };
} }

View file

@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec { flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi"; pname = "flashplayer-ppapi";
version = "32.0.0.363"; version = "32.0.0.371";
src = fetchzip { src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9";
stripRoot = false; stripRoot = false;
}; };

View file

@ -1,6 +1,6 @@
{ {
"81.0.4044.122" = { "81.0.4044.138" = {
rev = "81.0.4044.122-2"; rev = "81.0.4044.138-1";
sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q"; sha256 = "1qa5lw2psaqxr2zklaldx4sm6by4gsw3mfrp01ijc4kkp9jmvg7r";
}; };
} }

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1";
sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj";
version = "83.0.4103.14"; version = "83.0.4103.34";
}; };
dev = { dev = {
sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd";
sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1";
version = "84.0.4115.5"; version = "84.0.4128.3";
}; };
stable = { stable = {
sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l";
sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx";
version = "81.0.4044.122"; version = "81.0.4044.138";
}; };
} }

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "atlantis"; pname = "atlantis";
version = "0.12.0"; version = "0.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "runatlantis"; owner = "runatlantis";
repo = "atlantis"; repo = "atlantis";
rev = "v${version}"; rev = "v${version}";
sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; sha256 = "1ymixbix9sxhzmixqm9yjm9181aqnwnllqnswr0fq0nljw4018dn";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "node-problem-detector"; pname = "node-problem-detector";
version = "0.8.1"; version = "0.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; sha256 = "0cphlaf9k2va879jgqd6fzdgkscpwg29j1cpr677i3zj3hfgaw1g";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -37,7 +37,8 @@ buildGoModule rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Various problem detectors running on the Kubernetes nodes"; description = "Various problem detectors running on the Kubernetes nodes";
homepage = "https://github.com/kubernetes/node-problem-detector"; homepage = "https://github.com/kubernetes/node-problem-detector";
changelog = "https://github.com/kubernetes/node-problem-detector/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ lbpdt ]; maintainers = with maintainers; [ lbpdt ];
}; };
} }

View file

@ -224,6 +224,14 @@
version = "2.7.0"; version = "2.7.0";
sha256 = "11c54waq7w34l79ak4kizjkmh8zjca5ygh9yib691hdmxsx2cifj"; sha256 = "11c54waq7w34l79ak4kizjkmh8zjca5ygh9yib691hdmxsx2cifj";
}; };
ct =
{
owner = "poseidon";
repo = "terraform-provider-ct";
rev = "v0.5.0";
version = "0.5.0";
sha256 = "1zqfaxlyhr9vpqj2qqpfyh1f1nfpynb7c5ris6mdmy9zin55ppni";
};
datadog = datadog =
{ {
owner = "terraform-providers"; owner = "terraform-providers";

View file

@ -118,6 +118,7 @@ slugs=(
carlpett/terraform-provider-sops carlpett/terraform-provider-sops
poseidon/terraform-provider-matchbox poseidon/terraform-provider-matchbox
spaceapegames/terraform-provider-wavefront spaceapegames/terraform-provider-wavefront
poseidon/terraform-provider-ct
tweag/terraform-provider-nixos tweag/terraform-provider-nixos
tweag/terraform-provider-secret tweag/terraform-provider-secret
) )

View file

@ -2,7 +2,7 @@
"name": "riot-desktop", "name": "riot-desktop",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.6.3", "version": "1.6.4",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
@ -48,7 +48,7 @@
"find-npm-prefix": "^1.0.2", "find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"matrix-js-sdk": "6.2.0", "matrix-js-sdk": "6.2.1",
"mkdirp": "^1.0.3", "mkdirp": "^1.0.3",
"needle": "^2.3.2", "needle": "^2.3.2",
"node-pre-gyp": "^0.14.0", "node-pre-gyp": "^0.14.0",

View file

@ -3154,11 +3154,11 @@
}; };
} }
{ {
name = "matrix_js_sdk___matrix_js_sdk_6.2.0.tgz"; name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
path = fetchurl { path = fetchurl {
name = "matrix_js_sdk___matrix_js_sdk_6.2.0.tgz"; name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0.tgz"; url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz";
sha1 = "b1aa6f23858ab3ee4b66be25d3e854f6e287d36b"; sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b";
}; };
} }
{ {

View file

@ -8,12 +8,12 @@
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.6.3"; version = "1.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "riot-desktop"; repo = "riot-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "0dic2xpasf4m22275yrf7s8xnkh77n14cr62gd86j6g7x9rxa8fd"; sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2";
}; };
electron = electron_7; electron = electron_7;

View file

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "riot-web"; pname = "riot-web";
version = "1.6.3"; version = "1.6.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1v8sz2shj2gjf0vlj7r8g9d2v0qbsg9x64bq5g62nglbnphkcv0k"; sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2";
}; };
installPhase = '' installPhase = ''

View file

@ -19,12 +19,12 @@ with lib;
mkDerivation rec { mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "2.1.7"; version = "2.1.10";
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "0qnabi1g760y5wf4k9vnh78y0kwmni2wxr59rqr0lq3x39zv0i69"; sha256 = "0z2mlrbzknjnkgmpyaiw80cjd5cjymdvl3a0wjaippn7xhilbh52";
}; };
postPatch = '' postPatch = ''

View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openbazaar-client"; pname = "openbazaar-client";
version = "2.4.4"; version = "2.4.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
sha256 = "146vqwc1gv5zqcz60np8v9ps44m0d2yyjzqpmd4s0pcywvvwdvn6"; sha256 = "0kahqqchalbyzy51gkxzmw91qignh8sprg57nbj1vmgm84w1z6kw";
}; };
dontBuild = true; dontBuild = true;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext { stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd , IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon , libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
@ -29,7 +29,6 @@ let
inherit (primary-src) major minor subdir version; inherit (primary-src) major minor subdir version;
lib = stdenv.lib;
langsSpaces = lib.concatStringsSep " " langs; langsSpaces = lib.concatStringsSep " " langs;
mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation;
@ -96,9 +95,9 @@ in (mkDrv rec {
# are in multiple directories due to each having their own derivation. # are in multiple directories due to each having their own derivation.
postPatch = let postPatch = let
inc = e: path: inc = e: path:
"${e.dev}/include/KF5/${path}"; "${lib.getDev e}/include/KF5/${path}";
libs = list: libs = list:
lib.concatMapStringsSep " " (e: "-L${e.out}/lib") list; lib.concatMapStringsSep " " (e: "-L${lib.getLib e}/lib") list;
in '' in ''
substituteInPlace shell/source/unix/exec/shellexec.cxx \ substituteInPlace shell/source/unix/exec/shellexec.cxx \
--replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"}
@ -377,7 +376,7 @@ in (mkDrv rec {
"--enable-kf5" "--enable-kf5"
"--enable-qt5" "--enable-qt5"
"--enable-gtk3-kde5" "--enable-gtk3-kde5"
]; ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there
checkPhase = '' checkPhase = ''
make unitcheck make unitcheck

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, which, gfortran, libGLU, xorg } : { stdenv, fetchurl, which, gfortran, libGLU, xorg } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.2"; version = "6.3";
pname = "molden"; pname = "molden";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
sha256 = "01m5p7v5pz1fi77var50sp1bzlvdckwr6kn4wanvic2jmvgp9q5n"; sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1";
}; };
nativeBuildInputs = [ which ]; nativeBuildInputs = [ which ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lean"; pname = "lean";
version = "3.14.0"; version = "3.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leanprover-community"; owner = "leanprover-community";
repo = "lean"; repo = "lean";
rev = "v${version}"; rev = "v${version}";
sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b"; sha256 = "0fl8v8n53fr5qdnabici1mj3zpmjrkssx970y3q4m48s68q665v6";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
(enableFeature withGUI "qt") (enableFeature withGUI "qt")
]; ];
CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; CXXFLAGS = optional stdenv.cc.isClang "-std=c++17";
dontWrapQtApps = true; dontWrapQtApps = true;
postFixup = optionalString withGUI '' postFixup = optionalString withGUI ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "papirus-icon-theme"; pname = "papirus-icon-theme";
version = "20200430"; version = "20200602";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam"; owner = "PapirusDevelopmentTeam";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1dgxf3fi4x5iy504xncj1jba8cd51axkn2j1cfb220rpc6mzv25l"; sha256 = "0cms5dn8qfasi9xpfcq1hsdyvcb39vkh97mjvi7zrng4iyihq06y";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "amber-theme"; pname = "amber-theme";
version = "3.34-2"; version = "3.36-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lassekongo83"; owner = "lassekongo83";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0809l4r1qrzs9z04kcs1j962dpsvgpwpksnxs09md5722mynn65l"; sha256 = "0dn81ca3kyfz4ql15kl5108gw309cc0c1inmwlch1nq5dslmfjji";
}; };
nativeBuildInputs = [ meson ninja sassc ]; nativeBuildInputs = [ meson ninja sassc ];

View file

@ -137,9 +137,6 @@ self: super: {
then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; })
else super.conduit-extra; else super.conduit-extra;
# https://github.com/cachix/cachix/issues/308
cachix = dontCheck super.cachix;
# Fix Darwin build. # Fix Darwin build.
halive = if pkgs.stdenv.isDarwin halive = if pkgs.stdenv.isDarwin
then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
@ -216,18 +213,9 @@ self: super: {
# base bound # base bound
digit = doJailbreak super.digit; digit = doJailbreak super.digit;
# Needs older version of QuickCheck. # 2020-06-05: HACK: does not passes own build suite - `dontCheck`
these_0_7_6 = doJailbreak super.these_0_7_6; hnix = generateOptparseApplicativeCompletion "hnix" (
dontCheck super.hnix
# dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably)
# This is due to GenList having been removed from generic-random in 1.2.0.0
# doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
# This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
# Does not support recent versions of "these".
# https://github.com/haskell-nix/hnix/issues/514
hnix =
generateOptparseApplicativeCompletion "hnix" (
dontCheck (doJailbreak (super.hnix.override { these = self.these_0_7_6; }))
); );
# Fails for non-obvious reasons while attempting to use doctest. # Fails for non-obvious reasons while attempting to use doctest.
@ -1036,15 +1024,13 @@ self: super: {
# Test has either build errors or fails anyway, depending on the compiler. # Test has either build errors or fails anyway, depending on the compiler.
vector-algorithms = dontCheck super.vector-algorithms; vector-algorithms = dontCheck super.vector-algorithms;
# The test suite attempts to use the network. # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network.
# Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837
dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall); dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall);
# Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997
dhall-json = dhall-json =
generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] ( generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"]
dontCheck super.dhall-json super.dhall-json;
);
dhall-nix = dhall-nix =
generateOptparseApplicativeCompletion "dhall-to-nix" ( generateOptparseApplicativeCompletion "dhall-to-nix" (
@ -1057,10 +1043,6 @@ self: super: {
# https://github.com/haskell-hvr/hgettext/issues/14 # https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext; hgettext = doJailbreak super.hgettext;
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
haddock-library = doJailbreak (dontCheck super.haddock-library);
haddock-library_1_9_0 = doJailbreak (dontCheck super.haddock-library_1_9_0);
# Generate shell completion. # Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; })); stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; }));
@ -1116,7 +1098,8 @@ self: super: {
# Generate shell completions # Generate shell completions
generateOptparseApplicativeCompletion "purs" dontHaddockPurescript; generateOptparseApplicativeCompletion "purs" dontHaddockPurescript;
# https://github.com/kcsongor/generic-lens/pull/65 # 2020-06-05: HACK: Package can not pass test suite,
# Upstream Report: https://github.com/kcsongor/generic-lens/issues/83
generic-lens = dontCheck super.generic-lens; generic-lens = dontCheck super.generic-lens;
# https://github.com/danfran/cabal-macosx/issues/13 # https://github.com/danfran/cabal-macosx/issues/13
@ -1162,7 +1145,9 @@ self: super: {
''; '';
}); });
# test suite failure: https://github.com/jgm/pandoc/issues/5582 # 2020-06-05: HACK: In Nixpkgs currently this is
# old pandoc version 2.7.4 to current 2.9.2.1,
# test suite failures: https://github.com/jgm/pandoc/issues/5582
pandoc = dontCheck super.pandoc; pandoc = dontCheck super.pandoc;
# Fix build with attr-2.4.48 (see #53716) # Fix build with attr-2.4.48 (see #53716)
@ -1260,7 +1245,7 @@ self: super: {
}); });
# Needs the corresponding version of haskell-src-exts. # Needs the corresponding version of haskell-src-exts.
haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_23_0; }; haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_23_1; };
# https://github.com/Daniel-Diaz/HaTeX/issues/144 # https://github.com/Daniel-Diaz/HaTeX/issues/144
HaTeX = dontCheck super.HaTeX; HaTeX = dontCheck super.HaTeX;
@ -1482,28 +1467,30 @@ self: super: {
}; };
# Needed for ghcide # Needed for ghcide
haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override { haskell-lsp_0_22_0_0 = super.haskell-lsp_0_22_0_0.override {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0; haskell-lsp-types = self.haskell-lsp-types_0_22_0_0;
}; };
# this will probably need to get updated with every ghcide update, # this will probably need to get updated with every ghcide update,
# we need an override because ghcide is tracking haskell-lsp closely. # we need an override because ghcide is tracking haskell-lsp closely.
ghcide = dontCheck (super.ghcide.override rec { ghcide = dontCheck (super.ghcide.override rec {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0; haskell-lsp-types = self.haskell-lsp-types_0_22_0_0;
haskell-lsp = self.haskell-lsp_0_19_0_0; haskell-lsp = self.haskell-lsp_0_22_0_0;
hie-bios = self.hie-bios_0_5_0;
ghc-check = self.ghc-check_0_3_0_1;
}); });
# stackage right now is not new enough for hlint-3.0 # stackage right now is not new enough for hlint-3.0
ghc-lib-parser-ex_8_10_0_11 = super.ghc-lib-parser-ex_8_10_0_11.override { ghc-lib-parser-ex_8_10_0_13 = super.ghc-lib-parser-ex_8_10_0_13.override {
ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200523; ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200523;
}; };
hlint = super.hlint.override { hlint = super.hlint.override {
ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200523; ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200523;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_11; ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_13;
extra = self.extra_1_7_2; extra = self.extra_1_7_3;
filepattern = self.filepattern.override { filepattern = self.filepattern.override {
extra = self.extra_1_7_2; extra = self.extra_1_7_3;
}; };
}; };

View file

@ -102,6 +102,7 @@ self: super: {
# Jailbreak to fix the build. # Jailbreak to fix the build.
aeson-diff = doJailbreak super.aeson-diff; aeson-diff = doJailbreak super.aeson-diff;
brick = doJailbreak super.brick; brick = doJailbreak super.brick;
cabal-plan = doJailbreak super.cabal-plan;
cborg = doJailbreak super.cborg; cborg = doJailbreak super.cborg;
cborg-json = doJailbreak super.cborg-json; cborg-json = doJailbreak super.cborg-json;
exact-pi = doJailbreak super.exact-pi; exact-pi = doJailbreak super.exact-pi;
@ -126,13 +127,6 @@ self: super: {
# Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog
apply-refact = super.apply-refact_0_8_0_0; apply-refact = super.apply-refact_0_8_0_0;
# Apply patch to fix the build.
cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch {
name = "cabal-plan-fix-for-ghc-8.10.x.patch";
url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch";
sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
});
# https://github.com/commercialhaskell/pantry/issues/21 # https://github.com/commercialhaskell/pantry/issues/21
pantry = appendPatch super.pantry (pkgs.fetchpatch { pantry = appendPatch super.pantry (pkgs.fetchpatch {
name = "add-cabal-3.2.x-support.patch"; name = "add-cabal-3.2.x-support.patch";

View file

@ -74,7 +74,7 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs # not yet available in Nixpkgs
- gi-gdkx11 < 4 - gi-gdkx11 < 4
# LTS Haskell 15.13 # LTS Haskell 15.15
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Angle ==1.0 - AC-Angle ==1.0
@ -92,7 +92,7 @@ default-package-overrides:
- aeson-casing ==0.2.0.0 - aeson-casing ==0.2.0.0
- aeson-compat ==0.3.9 - aeson-compat ==0.3.9
- aeson-default ==0.9.1.0 - aeson-default ==0.9.1.0
- aeson-diff ==1.1.0.8 - aeson-diff ==1.1.0.9
- aeson-generic-compat ==0.0.1.3 - aeson-generic-compat ==0.0.1.3
- aeson-lens ==0.5.0.0 - aeson-lens ==0.5.0.0
- aeson-optics ==1.1.0.1 - aeson-optics ==1.1.0.1
@ -237,7 +237,7 @@ default-package-overrides:
- asn1-encoding ==0.9.6 - asn1-encoding ==0.9.6
- asn1-parse ==0.9.5 - asn1-parse ==0.9.5
- asn1-types ==0.3.4 - asn1-types ==0.3.4
- assert-failure ==0.1.2.2 - assert-failure ==0.1.2.3
- assoc ==1.0.1 - assoc ==1.0.1
- astro ==0.4.2.1 - astro ==0.4.2.1
- async ==2.2.2 - async ==2.2.2
@ -265,7 +265,7 @@ default-package-overrides:
- auto-update ==0.1.6 - auto-update ==0.1.6
- avers ==0.0.17.1 - avers ==0.0.17.1
- avro ==0.4.7.0 - avro ==0.4.7.0
- aws-cloudfront-signed-cookies ==0.2.0.4 - aws-cloudfront-signed-cookies ==0.2.0.6
- base16-bytestring ==0.1.1.6 - base16-bytestring ==0.1.1.6
- base32string ==0.9.1 - base32string ==0.9.1
- base58string ==0.10.0 - base58string ==0.10.0
@ -333,7 +333,7 @@ default-package-overrides:
- boots ==0.2.0.1 - boots ==0.2.0.1
- bordacount ==0.1.0.0 - bordacount ==0.1.0.0
- boring ==0.1.3 - boring ==0.1.3
- both ==0.1.1.0 - both ==0.1.1.1
- bound ==2.0.1 - bound ==2.0.1
- BoundedChan ==1.0.3.0 - BoundedChan ==1.0.3.0
- bounded-queue ==1.0.0 - bounded-queue ==1.0.0
@ -347,7 +347,7 @@ default-package-overrides:
- btrfs ==0.2.0.0 - btrfs ==0.2.0.0
- buffer-builder ==0.2.4.7 - buffer-builder ==0.2.4.7
- buffer-pipe ==0.0 - buffer-pipe ==0.0
- bugsnag-hs ==0.1.0.1 - bugsnag-hs ==0.1.0.3
- butcher ==1.3.3.1 - butcher ==1.3.3.1
- bv ==0.5 - bv ==0.5
- bv-little ==1.1.1 - bv-little ==1.1.1
@ -384,14 +384,14 @@ default-package-overrides:
- casa-types ==0.0.1 - casa-types ==0.0.1
- cased ==0.1.0.0 - cased ==0.1.0.0
- case-insensitive ==1.2.1.0 - case-insensitive ==1.2.1.0
- cases ==0.1.3.2 - cases ==0.1.4
- casing ==0.1.4.1 - casing ==0.1.4.1
- cassava ==0.5.2.0 - cassava ==0.5.2.0
- cassava-conduit ==0.5.1 - cassava-conduit ==0.5.1
- cassava-megaparsec ==2.0.1 - cassava-megaparsec ==2.0.1
- cast ==0.1.0.2 - cast ==0.1.0.2
- category ==0.2.5.0 - category ==0.2.5.0
- cayley-client ==0.4.12 - cayley-client ==0.4.13
- cborg ==0.2.3.0 - cborg ==0.2.3.0
- cborg-json ==0.2.2.0 - cborg-json ==0.2.2.0
- cereal ==0.5.8.1 - cereal ==0.5.8.1
@ -473,7 +473,7 @@ default-package-overrides:
- conduit-concurrent-map ==0.1.1 - conduit-concurrent-map ==0.1.1
- conduit-extra ==1.3.5 - conduit-extra ==1.3.5
- conduit-parse ==0.2.1.0 - conduit-parse ==0.2.1.0
- conduit-zstd ==0.0.1.1 - conduit-zstd ==0.0.2.0
- conferer ==0.2.0.0 - conferer ==0.2.0.0
- conferer-hspec ==0.2.0.0 - conferer-hspec ==0.2.0.0
- conferer-provider-json ==0.2.0.0 - conferer-provider-json ==0.2.0.0
@ -673,7 +673,7 @@ default-package-overrides:
- enclosed-exceptions ==1.0.3 - enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0 - ENIG ==0.0.1.0
- entropy ==0.4.1.6 - entropy ==0.4.1.6
- enummapset ==0.6.0.2 - enummapset ==0.6.0.3
- enumset ==0.0.5 - enumset ==0.0.5
- enum-subset-generate ==0.1.0.0 - enum-subset-generate ==0.1.0.0
- envelope ==0.2.2.0 - envelope ==0.2.2.0
@ -681,7 +681,7 @@ default-package-overrides:
- epub-metadata ==4.5 - epub-metadata ==4.5
- eq ==4.2 - eq ==4.2
- equal-files ==0.0.5.3 - equal-files ==0.0.5.3
- equational-reasoning ==0.6.0.2 - equational-reasoning ==0.6.0.3
- erf ==2.0.0.0 - erf ==2.0.0.0
- errors ==2.3.0 - errors ==2.3.0
- errors-ext ==0.4.2 - errors-ext ==0.4.2
@ -876,7 +876,7 @@ default-package-overrides:
- gitrev ==1.3.1 - gitrev ==1.3.1
- gi-xlib ==2.0.8 - gi-xlib ==2.0.8
- gl ==0.9 - gl ==0.9
- glabrous ==2.0.1 - glabrous ==2.0.2
- GLFW-b ==3.3.0.0 - GLFW-b ==3.3.0.0
- Glob ==0.10.0 - Glob ==0.10.0
- gloss ==1.13.1.1 - gloss ==1.13.1.1
@ -886,7 +886,7 @@ default-package-overrides:
- gluturtle ==0.0.58.1 - gluturtle ==0.0.58.1
- gnuplot ==0.5.6.1 - gnuplot ==0.5.6.1
- google-isbn ==1.0.3 - google-isbn ==1.0.3
- gothic ==0.1.4 - gothic ==0.1.5
- gpolyline ==0.1.0.1 - gpolyline ==0.1.0.1
- graph-core ==0.3.0.0 - graph-core ==0.3.0.0
- graphite ==0.10.0.1 - graphite ==0.10.0.1
@ -895,8 +895,8 @@ default-package-overrides:
- graph-wrapper ==0.2.6.0 - graph-wrapper ==0.2.6.0
- gravatar ==0.8.0 - gravatar ==0.8.0
- greskell ==1.0.1.0 - greskell ==1.0.1.0
- greskell-core ==0.1.3.2 - greskell-core ==0.1.3.3
- greskell-websocket ==0.1.2.2 - greskell-websocket ==0.1.2.3
- groom ==0.1.2.1 - groom ==0.1.2.1
- group-by-date ==0.1.0.3 - group-by-date ==0.1.0.3
- groups ==0.4.1.0 - groups ==0.4.1.0
@ -922,7 +922,7 @@ default-package-overrides:
- haskell-lexer ==1.1 - haskell-lexer ==1.1
- haskell-lsp ==0.20.0.1 - haskell-lsp ==0.20.0.1
- haskell-lsp-types ==0.20.0.0 - haskell-lsp-types ==0.20.0.0
- haskell-names ==0.9.8 - haskell-names ==0.9.9
- haskell-src ==1.0.3.1 - haskell-src ==1.0.3.1
- haskell-src-exts ==1.22.0 - haskell-src-exts ==1.22.0
- haskell-src-exts-util ==0.2.5 - haskell-src-exts-util ==0.2.5
@ -930,11 +930,11 @@ default-package-overrides:
- haskey-btree ==0.3.0.1 - haskey-btree ==0.3.0.1
- haskoin-core ==0.10.1 - haskoin-core ==0.10.1
- haskoin-node ==0.9.21 - haskoin-node ==0.9.21
- hasql ==1.4.2 - hasql ==1.4.3
- hasql-optparse-applicative ==0.3.0.5 - hasql-optparse-applicative ==0.3.0.5
- hasql-pool ==0.5.2 - hasql-pool ==0.5.2
- hasql-transaction ==1.0.0.1 - hasql-transaction ==1.0.0.1
- hasty-hamiltonian ==1.3.2 - hasty-hamiltonian ==1.3.3
- HaXml ==1.25.5 - HaXml ==1.25.5
- haxr ==3000.11.4 - haxr ==3000.11.4
- hdaemonize ==0.5.6 - hdaemonize ==0.5.6
@ -1005,7 +1005,7 @@ default-package-overrides:
- HSlippyMap ==3.0.1 - HSlippyMap ==3.0.1
- hslogger ==1.3.1.0 - hslogger ==1.3.1.0
- hslua ==1.0.3.2 - hslua ==1.0.3.2
- hslua-aeson ==1.0.1 - hslua-aeson ==1.0.2
- hslua-module-system ==0.2.1 - hslua-module-system ==0.2.1
- hslua-module-text ==0.2.1 - hslua-module-text ==0.2.1
- HsOpenSSL ==0.11.4.18 - HsOpenSSL ==0.11.4.18
@ -1126,7 +1126,7 @@ default-package-overrides:
- indexed-profunctors ==0.1 - indexed-profunctors ==0.1
- infer-license ==0.2.0 - infer-license ==0.2.0
- inflections ==0.4.0.5 - inflections ==0.4.0.5
- influxdb ==1.7.1.3 - influxdb ==1.7.1.5
- ini ==0.4.1 - ini ==0.4.1
- inj ==1.0 - inj ==1.0
- inline-c ==0.9.1.0 - inline-c ==0.9.1.0
@ -1155,10 +1155,10 @@ default-package-overrides:
- io-storage ==0.3 - io-storage ==0.3
- io-streams ==1.5.1.0 - io-streams ==1.5.1.0
- io-streams-haproxy ==1.0.1.0 - io-streams-haproxy ==1.0.1.0
- ip ==1.7.1 - ip ==1.7.2
- ip6addr ==1.0.1 - ip6addr ==1.0.1
- iproute ==1.7.9 - iproute ==1.7.9
- IPv6Addr ==1.1.3 - IPv6Addr ==1.1.4
- ipynb ==0.1.0.1 - ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.0 - ipython-kernel ==0.10.2.0
- irc ==0.6.1.0 - irc ==0.6.1.0
@ -1179,7 +1179,7 @@ default-package-overrides:
- js-flot ==0.8.3 - js-flot ==0.8.3
- js-jquery ==3.3.1 - js-jquery ==3.3.1
- json-alt ==1.0.0 - json-alt ==1.0.0
- json-feed ==1.0.9 - json-feed ==1.0.10
- jsonpath ==0.2.0.0 - jsonpath ==0.2.0.0
- json-rpc ==1.0.1 - json-rpc ==1.0.1
- json-rpc-generic ==0.2.1.5 - json-rpc-generic ==0.2.1.5
@ -1202,7 +1202,7 @@ default-package-overrides:
- kind-generics-th ==0.2.2.0 - kind-generics-th ==0.2.2.0
- kmeans ==0.1.3 - kmeans ==0.1.3
- koofr-client ==1.0.0.3 - koofr-client ==1.0.0.3
- kubernetes-webhook-haskell ==0.2.0.1 - kubernetes-webhook-haskell ==0.2.0.2
- l10n ==0.1.0.1 - l10n ==0.1.0.1
- labels ==0.3.3 - labels ==0.3.3
- lackey ==1.0.12 - lackey ==1.0.12
@ -1215,7 +1215,7 @@ default-package-overrides:
- language-java ==0.2.9 - language-java ==0.2.9
- language-javascript ==0.7.1.0 - language-javascript ==0.7.1.0
- language-protobuf ==1.0.1 - language-protobuf ==1.0.1
- language-puppet ==1.4.6.3 - language-puppet ==1.4.6.5
- lapack-carray ==0.0.3 - lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1 - lapack-comfort-array ==0.0.0.1
- lapack-ffi ==0.0.2 - lapack-ffi ==0.0.2
@ -1237,7 +1237,7 @@ default-package-overrides:
- lens-datetime ==0.3 - lens-datetime ==0.3
- lens-family ==2.0.0 - lens-family ==2.0.0
- lens-family-core ==2.0.0 - lens-family-core ==2.0.0
- lens-family-th ==0.5.0.2 - lens-family-th ==0.5.1.0
- lens-misc ==0.0.2.0 - lens-misc ==0.0.2.0
- lens-properties ==4.11.1 - lens-properties ==4.11.1
- lens-regex ==0.1.1 - lens-regex ==0.1.1
@ -1298,7 +1298,7 @@ default-package-overrides:
- massiv-io ==0.2.1.0 - massiv-io ==0.2.1.0
- massiv-test ==0.1.2 - massiv-test ==0.1.2
- mathexpr ==0.3.0.0 - mathexpr ==0.3.0.0
- math-functions ==0.3.3.0 - math-functions ==0.3.4.0
- matplotlib ==0.7.5 - matplotlib ==0.7.5
- matrices ==0.5.0 - matrices ==0.5.0
- matrix ==0.3.6.1 - matrix ==0.3.6.1
@ -1327,7 +1327,7 @@ default-package-overrides:
- microlens-ghc ==0.4.12 - microlens-ghc ==0.4.12
- microlens-mtl ==0.2.0.1 - microlens-mtl ==0.2.0.1
- microlens-platform ==0.4.1 - microlens-platform ==0.4.1
- microlens-process ==0.2.0.1 - microlens-process ==0.2.0.2
- microlens-th ==0.4.3.5 - microlens-th ==0.4.3.5
- microspec ==0.2.1.3 - microspec ==0.2.1.3
- microstache ==1.0.1.1 - microstache ==1.0.1.1
@ -1454,7 +1454,7 @@ default-package-overrides:
- nonempty-containers ==0.3.3.0 - nonempty-containers ==0.3.3.0
- nonemptymap ==0.0.6.0 - nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.4 - non-empty-sequence ==0.2.0.4
- nonempty-vector ==0.2.0.1 - nonempty-vector ==0.2.0.2
- non-negative ==0.1.2 - non-negative ==0.1.2
- not-gloss ==0.7.7.0 - not-gloss ==0.7.7.0
- no-value ==1.0.0.0 - no-value ==1.0.0.0
@ -1535,7 +1535,7 @@ default-package-overrides:
- partial-isomorphisms ==0.2.2.1 - partial-isomorphisms ==0.2.2.1
- password ==1.0.0.0 - password ==1.0.0.0
- password-instances ==1.0.0.0 - password-instances ==1.0.0.0
- path ==0.7.0 - path ==0.7.1
- path-extra ==0.2.0 - path-extra ==0.2.0
- path-io ==1.6.0 - path-io ==1.6.0
- path-pieces ==0.2.1 - path-pieces ==0.2.1
@ -1644,7 +1644,7 @@ default-package-overrides:
- profunctors ==5.5.2 - profunctors ==5.5.2
- projectroot ==0.2.0.1 - projectroot ==0.2.0.1
- project-template ==0.2.0.1 - project-template ==0.2.0.1
- prometheus-client ==1.0.0 - prometheus-client ==1.0.0.1
- promises ==0.3 - promises ==0.3
- prompt ==0.1.1.2 - prompt ==0.1.1.2
- prospect ==0.1.0.0 - prospect ==0.1.0.0
@ -1666,7 +1666,7 @@ default-package-overrides:
- pureMD5 ==2.1.3 - pureMD5 ==2.1.3
- purescript-bridge ==0.13.0.0 - purescript-bridge ==0.13.0.0
- pushbullet-types ==0.4.1.0 - pushbullet-types ==0.4.1.0
- pusher-http-haskell ==1.5.1.11 - pusher-http-haskell ==1.5.1.13
- PyF ==0.9.0.1 - PyF ==0.9.0.1
- qchas ==1.1.0.1 - qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0 - qm-interpolated-string ==0.3.0.0
@ -1703,8 +1703,8 @@ default-package-overrides:
- rank2classes ==1.3.2.1 - rank2classes ==1.3.2.1
- Rasterific ==0.7.5.2 - Rasterific ==0.7.5.2
- rasterific-svg ==0.3.3.2 - rasterific-svg ==0.3.3.2
- ratel ==1.0.10 - ratel ==1.0.12
- ratel-wai ==1.1.2 - ratel-wai ==1.1.3
- rattle ==0.1 - rattle ==0.1
- rawfilepath ==0.2.4 - rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0 - rawstring-qm ==0.2.3.0
@ -1725,7 +1725,7 @@ default-package-overrides:
- reducers ==3.12.3 - reducers ==3.12.3
- refact ==0.3.0.2 - refact ==0.3.0.2
- ref-fd ==0.4.0.2 - ref-fd ==0.4.0.2
- reflection ==2.1.5 - reflection ==2.1.6
- RefSerialize ==0.4.0 - RefSerialize ==0.4.0
- regex ==1.1.0.0 - regex ==1.1.0.0
- regex-applicative ==0.3.3.1 - regex-applicative ==0.3.3.1
@ -1777,7 +1777,7 @@ default-package-overrides:
- RSA ==2.4.1 - RSA ==2.4.1
- runmemo ==1.0.0.1 - runmemo ==1.0.0.1
- run-st ==0.1.1.0 - run-st ==0.1.1.0
- safe ==0.3.18 - safe ==0.3.19
- safecopy ==0.10.3 - safecopy ==0.10.3
- safe-decimal ==0.2.0.0 - safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.0 - safe-exceptions ==0.1.7.0
@ -1802,7 +1802,7 @@ default-package-overrides:
- scanner ==0.3.1 - scanner ==0.3.1
- scheduler ==1.4.2.2 - scheduler ==1.4.2.2
- scientific ==0.3.6.2 - scientific ==0.3.6.2
- scotty ==0.11.5 - scotty ==0.11.6
- scrypt ==0.5.0 - scrypt ==0.5.0
- sdl2 ==2.5.2.0 - sdl2 ==2.5.2.0
- sdl2-gfx ==0.2 - sdl2-gfx ==0.2
@ -1883,7 +1883,7 @@ default-package-overrides:
- signal ==0.1.0.4 - signal ==0.1.0.4
- silently ==1.2.5.1 - silently ==1.2.5.1
- simple-affine-space ==0.1.1 - simple-affine-space ==0.1.1
- simple-cabal ==0.1.1 - simple-cabal ==0.1.2
- simple-cmd ==0.2.1 - simple-cmd ==0.2.1
- simple-cmd-args ==0.1.6 - simple-cmd-args ==0.1.6
- simple-log ==0.9.12 - simple-log ==0.9.12
@ -1909,10 +1909,10 @@ default-package-overrides:
- slist ==0.1.1.0 - slist ==0.1.1.0
- small-bytearray-builder ==0.3.4.0 - small-bytearray-builder ==0.3.4.0
- smallcheck ==1.1.5 - smallcheck ==1.1.5
- smoothie ==0.4.2.10 - smoothie ==0.4.2.11
- snap-blaze ==0.2.1.5 - snap-blaze ==0.2.1.5
- snap-core ==1.0.4.1 - snap-core ==1.0.4.1
- snap-server ==1.1.1.1 - snap-server ==1.1.1.2
- snowflake ==0.1.1.1 - snowflake ==0.1.1.1
- soap ==0.2.3.6 - soap ==0.2.3.6
- soap-tls ==0.1.1.4 - soap-tls ==0.1.1.4
@ -1929,11 +1929,11 @@ default-package-overrides:
- spatial-math ==0.5.0.1 - spatial-math ==0.5.0.1
- special-values ==0.1.0.0 - special-values ==0.1.0.0
- speculate ==0.4.2 - speculate ==0.4.2
- speedy-slice ==0.3.0 - speedy-slice ==0.3.1
- Spintax ==0.3.4 - Spintax ==0.3.4
- splice ==0.6.1.1 - splice ==0.6.1.1
- split ==0.2.3.4 - split ==0.2.3.4
- splitmix ==0.0.4 - splitmix ==0.0.5
- spoon ==0.3.1 - spoon ==0.3.1
- spreadsheet ==0.1.3.8 - spreadsheet ==0.1.3.8
- sqlcli ==0.2.2.0 - sqlcli ==0.2.2.0
@ -1980,9 +1980,9 @@ default-package-overrides:
- string-qq ==0.0.4 - string-qq ==0.0.4
- stringsearch ==0.3.6.6 - stringsearch ==0.3.6.6
- string-transform ==1.1.1 - string-transform ==1.1.1
- stripe-concepts ==1.0.2.2 - stripe-concepts ==1.0.2.4
- stripe-signature ==1.0.0.2 - stripe-signature ==1.0.0.4
- strive ==5.0.10 - strive ==5.0.12
- structs ==0.1.3 - structs ==0.1.3
- structured-cli ==2.5.2.0 - structured-cli ==2.5.2.0
- stylish-haskell ==0.10.0.0 - stylish-haskell ==0.10.0.0
@ -2090,13 +2090,13 @@ default-package-overrides:
- thread-local-storage ==0.2 - thread-local-storage ==0.2
- threads ==0.5.1.6 - threads ==0.5.1.6
- thread-supervisor ==0.1.0.0 - thread-supervisor ==0.1.0.0
- threepenny-gui ==0.8.3.1 - threepenny-gui ==0.8.3.2
- th-reify-compat ==0.0.1.5 - th-reify-compat ==0.0.1.5
- th-reify-many ==0.1.9 - th-reify-many ==0.1.9
- throttle-io-stream ==0.2.0.1 - throttle-io-stream ==0.2.0.1
- throwable-exceptions ==0.1.0.9 - throwable-exceptions ==0.1.0.9
- th-strict-compat ==0.1.0.1 - th-strict-compat ==0.1.0.1
- th-test-utils ==1.0.1 - th-test-utils ==1.0.2
- thyme ==0.3.5.5 - thyme ==0.3.5.5
- tidal ==1.4.9 - tidal ==1.4.9
- tile ==0.3.0.0 - tile ==0.3.0.0
@ -2138,7 +2138,7 @@ default-package-overrides:
- triplesec ==0.2.2.1 - triplesec ==0.2.2.1
- trivial-constraint ==0.6.0.0 - trivial-constraint ==0.6.0.0
- tsv2csv ==0.1.0.2 - tsv2csv ==0.1.0.2
- ttc ==0.2.1.0 - ttc ==0.2.2.0
- ttl-hashtables ==1.4.1.0 - ttl-hashtables ==1.4.1.0
- ttrie ==0.1.2.1 - ttrie ==0.1.2.1
- tuple ==0.3.0.2 - tuple ==0.3.0.2
@ -2197,7 +2197,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3 - unix-bytestring ==0.3.7.3
- unix-compat ==0.5.2 - unix-compat ==0.5.2
- unix-time ==0.4.7 - unix-time ==0.4.7
- unliftio ==0.2.12.1 - unliftio ==0.2.13
- unliftio-core ==0.1.2.0 - unliftio-core ==0.1.2.0
- unliftio-pool ==0.2.1.1 - unliftio-pool ==0.2.1.1
- unlit ==0.4.0.0 - unlit ==0.4.0.0
@ -2260,7 +2260,7 @@ default-package-overrides:
- wai-cors ==0.2.7 - wai-cors ==0.2.7
- wai-enforce-https ==0.0.2.1 - wai-enforce-https ==0.0.2.1
- wai-eventsource ==3.0.0 - wai-eventsource ==3.0.0
- wai-extra ==3.0.29.1 - wai-extra ==3.0.29.2
- wai-handler-launch ==3.0.3.1 - wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6 - wai-logger ==2.3.6
- wai-middleware-caching ==0.1.0.2 - wai-middleware-caching ==0.1.0.2
@ -2268,8 +2268,8 @@ default-package-overrides:
- wai-session ==0.3.3 - wai-session ==0.3.3
- wai-slack-middleware ==0.2.0 - wai-slack-middleware ==0.2.0
- wai-websockets ==3.0.1.2 - wai-websockets ==3.0.1.2
- warp ==3.3.11 - warp ==3.3.12
- warp-tls ==3.2.11 - warp-tls ==3.2.12
- warp-tls-uid ==0.2.0.6 - warp-tls-uid ==0.2.0.6
- wave ==0.2.0 - wave ==0.2.0
- wcwidth ==0.0.2 - wcwidth ==0.0.2
@ -2316,7 +2316,7 @@ default-package-overrides:
- xdg-basedir ==0.2.2 - xdg-basedir ==0.2.2
- xdg-userdirs ==0.1.0.2 - xdg-userdirs ==0.1.0.2
- xeno ==0.3.5.2 - xeno ==0.3.5.2
- xls ==0.1.2 - xls ==0.1.3
- xlsx ==0.8.0 - xlsx ==0.8.0
- xlsx-tabular ==0.2.2.1 - xlsx-tabular ==0.2.2.1
- xml ==1.3.14 - xml ==1.3.14
@ -2371,7 +2371,7 @@ default-package-overrides:
- zlib-bindings ==0.1.1.5 - zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1 - zlib-lens ==0.1.2.1
- zot ==0.0.3 - zot ==0.0.3
- zstd ==0.1.1.2 - zstd ==0.1.2.0
extra-packages: extra-packages:
- aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier
@ -2396,6 +2396,7 @@ extra-packages:
- dhall == 1.29.0 # required for spago 0.14.0. - dhall == 1.29.0 # required for spago 0.14.0.
- doctemplates == 0.8 # required by pandoc-2.9.x - doctemplates == 0.8 # required by pandoc-2.9.x
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0
- ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
- haddock == 2.22.* # required on GHC 8.0.x - haddock == 2.22.* # required on GHC 8.0.x
@ -2405,8 +2406,8 @@ extra-packages:
- happy <1.19.6 # newer versions break Agda - happy <1.19.6 # newer versions break Agda
- happy == 1.19.9 # for purescript - happy == 1.19.9 # for purescript
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-lsp == 0.19.* # required for ghcide 0.1.0 - haskell-lsp == 0.22.* # required for ghcide 0.2.0
- haskell-lsp-types == 0.19.* # required for ghcide 0.1.0 - haskell-lsp-types == 0.22.* # required for ghcide 0.2.0
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hoogle == 5.0.14 # required by hie-hoogle - hoogle == 5.0.14 # required by hie-hoogle
@ -2434,7 +2435,6 @@ extra-packages:
- seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
- split < 0.2 # newer versions don't work with GHC 6.12.3 - split < 0.2 # newer versions don't work with GHC 6.12.3
- tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x
- these == 0.7.6 # required by hnix 0.6.1
- transformers == 0.4.3.* # the latest version isn't supported by mtl yet - transformers == 0.4.3.* # the latest version isn't supported by mtl yet
- vector < 0.10.10 # newer versions don't work with GHC 6.12.3 - vector < 0.10.10 # newer versions don't work with GHC 6.12.3
- xml-conduit ^>= 1.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - xml-conduit ^>= 1.7 # pre-lts-11.x versions neeed by git-annex 6.20180227
@ -2586,6 +2586,9 @@ dont-distribute-packages:
- Obsidian - Obsidian
- odpic-raw - odpic-raw
- patch-image - patch-image
# license for input data unclear, dependency not on Hackage
# see https://github.com/NixOS/nixpkgs/pull/88604
- tensorflow-mnist
- yices-easy - yices-easy
- yices-painless - yices-painless
@ -5990,7 +5993,6 @@ broken-packages:
- hmt-diagrams - hmt-diagrams
- hmumps - hmumps
- hnetcdf - hnetcdf
- hnix
- hnix-store-remote - hnix-store-remote
- HNM - HNM
- hnormalise - hnormalise
@ -6047,9 +6049,6 @@ broken-packages:
- hOpenPGP - hOpenPGP
- hopenpgp-tools - hopenpgp-tools
- hopfield - hopfield
- hoppy-docs
- hoppy-generator
- hoppy-std
- hops - hops
- hoq - hoq
- horizon - horizon
@ -8574,10 +8573,6 @@ broken-packages:
- qr-imager - qr-imager
- qr-repa - qr-repa
- qsem - qsem
- qtah-cpp-qt5
- qtah-examples
- qtah-generator
- qtah-qt5
- QuadEdge - QuadEdge
- QuadTree - QuadTree
- quantfin - quantfin
@ -10243,6 +10238,7 @@ broken-packages:
- typeable-th - typeable-th
- TypeClass - TypeClass
- typed-encoding - typed-encoding
- typed-encoding-encoding
- typed-streams - typed-streams
- typed-wire - typed-wire
- typedflow - typedflow
@ -10423,6 +10419,7 @@ broken-packages:
- vect-floating-accelerate - vect-floating-accelerate
- vect-opengl - vect-opengl
- vector-bytestring - vector-bytestring
- vector-circular
- vector-clock - vector-clock
- vector-conduit - vector-conduit
- vector-endian - vector-endian

View file

@ -734,6 +734,7 @@ self: super: builtins.intersectAttrs super {
# Tests access homeless-shelter. # Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios; hie-bios = dontCheck super.hie-bios;
hie-bios_0_5_0 = dontCheck super.hie-bios_0_5_0;
# Compiling the readme throws errors and has no purpose in nixpkgs # Compiling the readme throws errors and has no purpose in nixpkgs
aeson-gadt-th = aeson-gadt-th =

View file

@ -32,47 +32,6 @@ in
tensorflow-logging = setTensorflowSourceRoot "tensorflow-logging" super.tensorflow-logging; tensorflow-logging = setTensorflowSourceRoot "tensorflow-logging" super.tensorflow-logging;
tensorflow-mnist = (setTensorflowSourceRoot "tensorflow-mnist" super.tensorflow-mnist).override {
# https://github.com/tensorflow/haskell/issues/215
tensorflow-mnist-input-data = self.tensorflow-mnist-input-data;
};
tensorflow-mnist-input-data = setTensorflowSourceRoot "tensorflow-mnist-input-data" (super.callPackage (
{ mkDerivation, base, bytestring, Cabal, cryptonite, directory
, filepath, HTTP, network-uri, stdenv
}:
let
fileInfos = {
"train-images-idx3-ubyte.gz" = "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609";
"train-labels-idx1-ubyte.gz" = "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c";
"t10k-images-idx3-ubyte.gz" = "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6";
"t10k-labels-idx1-ubyte.gz" = "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6";
};
downloads = with pkgs.lib; flip mapAttrsToList fileInfos (name: sha256:
pkgs.fetchurl {
url = "http://yann.lecun.com/exdb/mnist/${name}";
inherit sha256;
});
in
mkDerivation {
pname = "tensorflow-mnist-input-data";
version = "0.1.0.0";
enableSeparateDataOutput = true;
setupHaskellDepends = [
base bytestring Cabal cryptonite directory filepath HTTP
network-uri
];
preConfigure = pkgs.lib.strings.concatStringsSep "\n" (
map (x: "ln -s ${x} data/$(stripHash ${x})") downloads
);
libraryHaskellDepends = [ base ];
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Downloader of input data for training MNIST";
license = stdenv.lib.licenses.asl20;
}
) {});
tensorflow-opgen = setTensorflowSourceRoot "tensorflow-opgen" super.tensorflow-opgen; tensorflow-opgen = setTensorflowSourceRoot "tensorflow-opgen" super.tensorflow-opgen;
tensorflow-ops = setTensorflowSourceRoot "tensorflow-ops" super.tensorflow-ops; tensorflow-ops = setTensorflowSourceRoot "tensorflow-ops" super.tensorflow-ops;

File diff suppressed because it is too large Load diff

View file

@ -105,6 +105,15 @@ symlinkJoin {
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
fi fi
# ghcide does package discovery without calling our ghc wrapper.
if [[ -x "$out/bin/ghcide" ]]; then
wrapProgram $out/bin/ghcide \
--set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \
--set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \
--set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
fi
'' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
# Work around a linker limit in macOS Sierra (see generic-builder.nix): # Work around a linker limit in macOS Sierra (see generic-builder.nix):
local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local packageConfDir="$out/lib/${ghc.name}/package.conf.d";

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "faudio"; pname = "faudio";
version = "20.05"; version = "20.06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FNA-XNA"; owner = "FNA-XNA";
repo = "FAudio"; repo = "FAudio";
rev = version; rev = version;
sha256 = "14i0s0m1n57wjwzy54v1czq0w38xplcdsfn4nz5v6fryaxzr5z60"; sha256 = "1dyx9l7ldhlbb77ca3wk0l218589blvh78mdfyzpk9k1izk2yih1";
}; };
nativeBuildInputs = [cmake]; nativeBuildInputs = [cmake];

View file

@ -1,36 +0,0 @@
{ stdenv, fetchurl, static ? true }:
with stdenv.lib;
stdenv.mkDerivation {
name = "libjpeg-drop-9b";
srcs = [
(fetchurl {
url = "http://www.ijg.org/files/jpegsrc.v9b.tar.gz";
sha256 = "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4";
})
(fetchurl {
url = "http://jpegclub.org/droppatch.v9b.tar.gz";
sha256 = "022bnvpird7w5pwbfqpq7j7pwja5kp6x9k3sdypcy3g2nwwy2wwk";
})
];
postUnpack = ''
rm jpegtran
mv jpegtran.c jpeg-9b/jpegtran.c
mv transupp.c jpeg-9b/transupp.c
mv transupp.h jpeg-9b/transupp.h
'';
configureFlags = []
++ optionals static [ "--enable-static" "--disable-shared" ];
outputs = [ "bin" "dev" "out" "man" ];
meta = {
homepage = "http://jpegclub.org/jpegtran/";
description = "Experimental lossless crop 'n' drop (cut & paste) patches for libjpeg";
license = stdenv.lib.licenses.free;
};
}

View file

@ -55,7 +55,7 @@ in {
}; };
libtoxcore_0_2 = generic { libtoxcore_0_2 = generic {
version = "0.2.10"; version = "0.2.12";
sha256 = "0r5j2s5n8ikayvr1zylvv3ai3smbhm2m0yhpa9lfcsxhvyn9phcn"; sha256 = "0a6sqpm00d2rn0nviqfz4gh9ck1wzci6rxgmqmcyryl5ca19ffvp";
}; };
} }

View file

@ -1,14 +1,31 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openfst"; pname = "openfst";
version = "1.7.6"; version = "1.7.7";
src = fetchurl { src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
sha256 = "03hs0196qbjfbviqn6nnb7igvv3cnpxyizlwlzmx88a6fhiq97bm"; sha256 = "1gpkpkls78xlidqq241scdz9vagxl8c4ksc4lqj4ycwx6vzyliij";
}; };
meta = {
configureFlags = [
"--enable-compact-fsts"
"--enable-compress"
"--enable-const-fsts"
"--enable-far"
"--enable-linear-fsts"
"--enable-lookahead-fsts"
"--enable-mpdt"
"--enable-ngram-fsts"
"--enable-pdt"
];
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
description = "Library for working with finite-state transducers"; description = "Library for working with finite-state transducers";
longDescription = '' longDescription = ''
Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs).
@ -16,9 +33,8 @@ stdenv.mkDerivation rec {
pattern matching, string processing, machine learning, information extraction and retrieval among others pattern matching, string processing, machine learning, information extraction and retrieval among others
''; '';
homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome"; homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome";
license = stdenv.lib.licenses.asl20; license = licenses.asl20;
maintainers = [ stdenv.lib.maintainers.dfordivam ]; maintainers = [ maintainers.dfordivam ];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openxr-loader"; pname = "openxr-loader";
version = "1.0.8"; version = "1.0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "OpenXR-SDK-Source"; repo = "OpenXR-SDK-Source";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0p5i4360hc5y8rqhgpvg1f1yaxl7kay471868vfzkp44g8dybkvm"; sha256 = "0xm5bwbsv2qlx1mg9zr98q7rm5hginrff4z0ahv7jrqrzv24acp7";
}; };
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];

View file

@ -109,4 +109,11 @@ in
sha256 = "0l3gs0nlp10cjlwiln3f72zfch0av2g1r8m2ny9afgvwgbwiyj4h"; sha256 = "0l3gs0nlp10cjlwiln3f72zfch0av2g1r8m2ny9afgvwgbwiyj4h";
envvar = "REALSURFACE"; envvar = "REALSURFACE";
} }
{
name = "G4TENDL";
version = "1.3.2";
sha256 = "0jdqmz3rz5a7yrq1mli6dj3bnmn73igf4fdxwfbl3rxywg38fa9v";
envvar = "PARTICLEHP";
}
]) ])

View file

@ -36,12 +36,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "10.6.1"; version = "10.6.2";
pname = "geant4"; pname = "geant4";
src = fetchurl{ src = fetchurl{
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p01.tar.gz"; url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p02.tar.gz";
sha256 = "0ssxg7dd7vxljb3fdyb0llg7gsxack21qjfsb3n23k107a19yibk"; sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc";
}; };
cmakeFlags = [ cmakeFlags = [

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "pkger"; pname = "pkger";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "markbates"; owner = "markbates";
repo = "pkger"; repo = "pkger";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; sha256 = "195ba1avkpm9ssgakngv8j72k7yq2xna3xmm5m8l6c5g7lf91kkp";
}; };
vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp";
@ -20,6 +20,7 @@ buildGoModule rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; description = "Embed static files in Go binaries (replacement for gobuffalo/packr) ";
homepage = "https://github.com/markbates/pkger"; homepage = "https://github.com/markbates/pkger";
changelog = "https://github.com/markbates/pkger/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ flokli ]; maintainers = with maintainers; [ flokli ];
}; };

File diff suppressed because it is too large Load diff

View file

@ -145,6 +145,14 @@ with super;
]; ];
}); });
lua-lsp = super.lua-lsp.override({
# until Alloyed/lua-lsp#28
postConfigure = ''
substituteInPlace ''${rockspecFilename} \
--replace '"lpeglabel ~> 1.5",' '"lpeglabel >= 1.5",'
'';
});
lua-zlib = super.lua-zlib.override({ lua-zlib = super.lua-zlib.override({
buildInputs = [ buildInputs = [
pkgs.zlib.dev pkgs.zlib.dev
@ -294,6 +302,12 @@ with super;
}; };
}); });
lyaml = super.lyaml.override({
buildInputs = [
pkgs.libyaml
];
});
mpack = super.mpack.override({ mpack = super.mpack.override({
buildInputs = [ pkgs.libmpack ]; buildInputs = [ pkgs.libmpack ];
# the rockspec doesn't use the makefile so you may need to export more flags # the rockspec doesn't use the makefile so you may need to export more flags
@ -307,4 +321,13 @@ with super;
sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
''; '';
}); });
pulseaudio = super.pulseaudio.override({
buildInputs = [
pkgs.libpulseaudio
];
nativeBuildInputs = [
pkgs.pulseaudio pkgs.pkgconfig
];
});
} }

View file

@ -1,23 +0,0 @@
{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib_p4, herelib}:
buildOcaml rec {
name = "pa_test";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.00";
src = fetchurl {
url = "https://github.com/janestreet/pa_test/archive/${version}.tar.gz";
sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6";
};
buildInputs = [ pa_ounit ];
propagatedBuildInputs = [ type_conv sexplib_p4 herelib ];
meta = with stdenv.lib; {
homepage = "https://github.com/janestreet/pa_test";
description = "Syntax to reduce boiler plate in testing";
license = licenses.asl20;
maintainers = [ maintainers.ericbmerritt ];
};
}

View file

@ -52,13 +52,16 @@
, typing , typing
, nose , nose
, python , python
, isPy3k , pythonOlder
, pythonAtLeast
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "apache-airflow"; pname = "apache-airflow";
version = "1.10.5"; version = "1.10.5";
disabled = (!isPy3k); # Upstream does not yet support python 3.8
# https://github.com/apache/airflow/issues/8674
disabled = pythonOlder "3.5" || pythonAtLeast "3.8";
src = fetchFromGitHub rec { src = fetchFromGitHub rec {
owner = "apache"; owner = "apache";
@ -189,6 +192,6 @@ buildPythonPackage rec {
description = "Programmatically author, schedule and monitor data pipelines"; description = "Programmatically author, schedule and monitor data pipelines";
homepage = "http://airflow.apache.org/"; homepage = "http://airflow.apache.org/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ costrouc ingenieroariel ]; maintainers = with maintainers; [ bhipple costrouc ingenieroariel ];
}; };
} }

View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, isPy27 , isPy27
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pytest , pytest
, unittest2 , unittest2
, future , future
@ -27,6 +28,13 @@ buildPythonPackage rec {
}; };
patches = [
(fetchpatch {
url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
future numpy pillow scipy scikitlearn scikitimage threadpoolctl future numpy pillow scipy scikitlearn scikitimage threadpoolctl
]; ];

View file

@ -4,6 +4,7 @@
, django , django
, python , python
, pillow , pillow
, python_magic
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +15,7 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82"; sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82";
}; };
propagatedBuildInputs = [ pillow ]; propagatedBuildInputs = [ pillow python_magic ];
checkInputs = [ django ]; checkInputs = [ django ];

View file

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-api-python-client"; pname = "google-api-python-client";
version = "1.8.4"; version = "1.9.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06csvbpdv3kl806nqvh5hpag86wpafp1q9r07m7kc1fw3xhi5qmv"; sha256 = "0nfqf62g3l7ij779ind41p800ahdjijkhqx8nq6y029p98672c52";
}; };
# No tests included in archive # No tests included in archive

View file

@ -1,14 +1,16 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, mock }: , google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio
, mock
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-api-core"; pname = "google-api-core";
version = "1.16.0"; version = "1.17.0";
disabled = isPy27; # google namespace no longer works on python2 disabled = isPy27; # google namespace no longer works on python2
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1qh30ji399gngv2j1czzvi3h0mgx3lfdx2n8qp8vii7ihyh65scj"; sha256 = "12fn05x2fdhqmcaspjkkny2lh66hnnl0xf6pz3idxhlx8w5jl274";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -27,8 +29,13 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; description = "Core Library for Google Client Libraries";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; longDescription = ''
This library is not meant to stand-alone. Instead it defines common
helpers used by all Google API clients.
'';
homepage = "https://github.com/googleapis/python-api-core";
changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

View file

@ -17,11 +17,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-auth"; pname = "google-auth";
version = "1.11.3"; version = "1.16.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "05av4clwv7kdk1v55ibcv8aim6dwfg1mi4wy0vv91fr6wq3205zc"; sha256 = "1xd7fi7vhqbbkvwjg5fgj8bkbfjwxx4f2bb0zsnj8wci46qk4dqv";
}; };
propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
@ -43,8 +43,14 @@ buildPythonPackage rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "This library simplifies using Googles various server-to-server authentication mechanisms to access Google APIs."; description = "Google Auth Python Library";
homepage = "https://google-auth.readthedocs.io/en/latest/"; longDescription = ''
This library simplifies using Googles various server-to-server
authentication mechanisms to access Google APIs.
'';
homepage = "https://github.com/googleapis/google-auth-library-python";
changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
# Documentation: https://googleapis.dev/python/google-auth/latest/index.html
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

View file

@ -0,0 +1,82 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy
, olefile
, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
, openjpeg, libimagequant
, pytest, pytestrunner, pyroma, numpy
}:
buildPythonPackage rec {
pname = "Pillow";
version = "6.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv";
};
# Disable imagefont tests, because they don't work well with infinality:
# https://github.com/python-pillow/Pillow/issues/1259
postPatch = ''
rm Tests/test_imagefont.py
'';
checkPhase = ''
runHook preCheck
python -m pytest -v -x -W always
runHook postCheck
'';
propagatedBuildInputs = [ olefile ];
checkInputs = [ pytest pytestrunner pyroma numpy ];
buildInputs = [
freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
# NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
# NOTE: The Pillow install script will, by default, add paths like /usr/lib
# and /usr/include to the search paths. This can break things when building
# on a non-NixOS system that has some libraries installed that are not
# installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't
# build Pillow with this support). We patch the `disable_platform_guessing`
# setting here, instead of passing the `--disable-platform-guessing`
# command-line option, since the command-line option doesn't work when we run
# tests.
preConfigure = let
libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"'';
libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';
in ''
sed -i "setup.py" \
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ;
s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ;
s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ;
s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ;
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ;
s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ;
s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ;
s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;
s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;'
export LDFLAGS="-L${libwebp}/lib"
export CFLAGS="-I${libwebp}/include"
''
# Remove impurities
+ stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace setup.py \
--replace '"/Library/Frameworks",' "" \
--replace '"/System/Library/Frameworks"' ""
'';
meta = with stdenv.lib; {
homepage = "https://python-pillow.github.io/";
description = "Fork of The Python Imaging Library (PIL)";
longDescription = ''
The Python Imaging Library (PIL) adds image processing
capabilities to your Python interpreter. This library
supports many file formats, and provides powerful image
processing and graphics capabilities.
'';
license = "http://www.pythonware.com/products/pil/license.htm";
maintainers = with maintainers; [ goibhniu prikhi ];
};
}

View file

@ -1,32 +1,37 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy { stdenv, buildPythonPackage, fetchPypi, isPyPy
, olefile , olefile
, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
, pytestrunner , openjpeg, libimagequant
, pytest , pyroma, numpy, pytestCheckHook
, isPy3k
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Pillow"; pname = "Pillow";
version = "6.2.2"; version = "7.1.2";
disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950"; sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50";
}; };
doCheck = !stdenv.isDarwin && !isPyPy;
# Disable imagefont tests, because they don't work well with infinality: # Disable imagefont tests, because they don't work well with infinality:
# https://github.com/python-pillow/Pillow/issues/1259 # https://github.com/python-pillow/Pillow/issues/1259
postPatch = '' postPatch = ''
rm Tests/test_imagefont.py rm Tests/test_imagefont.py
''; '';
# Disable darwin tests which require executables: `iconutil` and `screencapture`
disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ];
propagatedBuildInputs = [ olefile ]; propagatedBuildInputs = [ olefile ];
checkInputs = [ pytest pytestrunner ]; checkInputs = [ pytestCheckHook pyroma numpy ];
buildInputs = [ buildInputs = [
freetype libjpeg zlib libtiff libwebp tcl lcms2 ] freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
# NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
@ -45,6 +50,8 @@ buildPythonPackage rec {
sed -i "setup.py" \ sed -i "setup.py" \
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ;
s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ;
s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ;
s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ;
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ;
s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ;
s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ;
@ -61,8 +68,8 @@ buildPythonPackage rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://python-pillow.github.io/"; homepage = "https://python-pillow.org/";
description = "Fork of The Python Imaging Library (PIL)"; description = "The friendly PIL fork (Python Imaging Library)";
longDescription = '' longDescription = ''
The Python Imaging Library (PIL) adds image processing The Python Imaging Library (PIL) adds image processing
capabilities to your Python interpreter. This library capabilities to your Python interpreter. This library

View file

@ -7,7 +7,6 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension= "zip";
sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f"; sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f";
}; };

View file

@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyMuPDF"; pname = "PyMuPDF";
version = "1.16.18"; version = "1.17.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0gpcmmcjgwc6x4rn6nm3akiijdkpa9nahsw2x8a0i7z7kzj4firk"; sha256 = "0de92a8fb65db6e661594cc5865a340a2daac3cb9bb58e030820769ece1343c1";
}; };
patchPhase = '' patchPhase = ''

View file

@ -4,6 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "shellingham"; pname = "shellingham";
version = "1.3.2"; version = "1.3.2";
format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

View file

@ -1,13 +1,26 @@
{ stdenv, buildPythonPackage, fetchPypi, twine, pbr, click, click-completion, validate-email, { stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder
pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy, , click
setuptools }: , click-completion
, factory_boy
, faker
, inquirer
, pbr
, pendulum
, ptable
, pytest
, pytestcov
, pytest-mock
, requests
, setuptools
, twine
, validate-email
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "toggl-cli"; pname = "toggl-cli";
version = "2.1.0"; version = "2.1.0";
disabled = pythonOlder "3.5" || pythonAtLeast "3.8";
disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
pname = "togglCli"; pname = "togglCli";

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }: { stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.32"; version = "8.33";
pname = "checkstyle"; pname = "checkstyle";
src = fetchurl { src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs"; sha256 = "03innxi9f44z2c785a94n3i0adm6mn3jjgqlvgx46nmigvw41mz6";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flow"; pname = "flow";
version = "0.125.1"; version = "0.126.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "0c6ai2fcssys8xd445xxc0zdn3jz6kcy85mac1p89mnlqd1r1xk4"; sha256 = "1acmhyhbl4s2c907nj8jwgg9fjjrfr306vagwkcx2lza4clb2aan";
}; };
installPhase = '' installPhase = ''

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint"; pname = "tflint";
version = "0.16.1"; version = "0.16.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1sh34zrk90sfi3x48d583izzw2bijnpsv6yqslzjpvsgkg8d96vz"; sha256 = "09s4a7xgzr6qr268j3bqjj18s9gn9xcssfvm6w918m7wd39zgqy0";
}; };
vendorSha256 = "0xgv4jsrh8rfas7577xqv609pac05rvyshfm8vjx0kv38rnx3hfv"; vendorSha256 = "1w833lx52m61dv4aq25946bnfwj8yd2g7w989d66ih39simxsvzr";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "bazelisk"; pname = "bazelisk";
version = "1.4.0"; version = "1.5.0";
patches = [ ./gomod.patch ]; patches = [ ./gomod.patch ];
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "bazelbuild"; owner = "bazelbuild";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq"; sha256 = "06vimiklcprsxq7l6rmxshv8l0kjr7aanpm206qgx3wvw4shibmw";
}; };
vendorSha256 = "10156k90ky3znb9rxhy7zasskxmlcs5cn9f3xk25ana1c66vxszr"; vendorSha256 = "11iwgrnid0f8sq9f23m1a3s55sc7lpl60phykmd9ss4xs39bapl5";
buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ];
@ -26,4 +26,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ elasticdog ]; maintainers = with maintainers; [ elasticdog ];
}; };
} }

View file

@ -6,7 +6,7 @@ index 8eef134..54382cb 100644
go 1.14 go 1.14
require ( require (
+ github.com/bazelbuild/rules_go v0.22.4 + github.com/bazelbuild/rules_go v0.23.3
github.com/hashicorp/go-version v1.2.0 github.com/hashicorp/go-version v1.2.0
github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-homedir v1.1.0
) )

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "doctl"; pname = "doctl";
version = "1.43.0"; version = "1.45.0";
vendorSha256 = null; vendorSha256 = null;
@ -30,7 +30,7 @@ buildGoModule rec {
owner = "digitalocean"; owner = "digitalocean";
repo = "doctl"; repo = "doctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "1x8rr3707mmbfnjn3ck0953xkkrfq5r8zflbxpkqlfz9k978z835"; sha256 = "1wnrvswysms8p26d8hnxpimx12bhi3sa9k4kwd2dbxg74569gq6d";
}; };
meta = with lib; { meta = with lib; {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ktlint"; pname = "ktlint";
version = "0.36.0"; version = "0.37.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
sha256 = "0pjxd4z0byqrr5qbk3k38vr1ln052m5vhlrky4agmhg5zhn38mm6"; sha256 = "1z2hvhcrz1rj9g8749x640axrf529wk361pckwb4ihn43c19ajpf";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "packet-cli"; pname = "packet-cli";
version = "0.0.6"; version = "0.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "packethost"; owner = "packethost";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "17f3ax7pjm5k93cxj7fd8hwr4id1lbzz9pkl2xflpxydi89bwdfz"; sha256 = "1ixdqq0xwy2l2m1w93rzqw5gfrzw7w03r42qab3n733m4jkf4ni1";
}; };
vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7"; vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7";

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-deny"; pname = "cargo-deny";
version = "0.6.7"; version = "0.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EmbarkStudios"; owner = "EmbarkStudios";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1d7zd2wpvfz1vq5ik67m6s1mscivh8b3kz4bfckw3cazk68vn9q1"; sha256 = "0nv3min7jyrv4scn7bhizc9vmqhmv6sg0nvfnr0m59pm5806vdpi";
}; };
cargoSha256 = "0jy10yfd9d5r0ildyxszs1ppzyd4ninl7lihdnwjqm6qifr1m5rp"; cargoSha256 = "1vywm3iqs3qnkrvi7i70sv21hznn3y3hza1i9gvcxfmh03wzhwx0";
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-udeps"; pname = "cargo-udeps";
version = "0.1.11"; version = "0.1.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "est31"; owner = "est31";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1drz0slv33p4spm52sb5lnmpb83q8l7k3cvp0zcsinbjv8glvvnv"; sha256 = "1hf2zkv3yd72kkvdwigms3wzchmh4i56ym3swpx35dij2h8g08mx";
}; };
cargoSha256 = "13ynab3s563n2xwkls7nmksis0ngx5klw9wc9bpnxgc5na9k84ll"; cargoSha256 = "0xb9fmcrsm47zkb26jw5rsi9wfz3jh19fbc74gnsrffdmfsd7mm2";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-watch"; pname = "cargo-watch";
version = "7.3.0"; version = "7.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "passcod"; owner = "passcod";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0l1aalb8ans7scljrza7akhi821jbpqgn6sa8kgd8sys83r93fkj"; sha256 = "0yg6im7hzwzl84gxcg7wbix5h0ciq4l4ql6ili7k0k7j8bhrxn82";
}; };
cargoSha256 = "07zkfpw0zyakpsm1mg525ibpsfs9swwmijb0xfsk3nbv66caqd04"; cargoSha256 = "1y299mvg9k568f16d2r92y0bgwfrng6idw21wcsd5mnsd28fsww1";
buildInputs = lib.optional stdenv.isDarwin CoreServices; buildInputs = lib.optional stdenv.isDarwin CoreServices;

View file

@ -9,7 +9,7 @@ let
name = pname; name = pname;
exec = "@out@/bin/${pname}"; exec = "@out@/bin/${pname}";
icon = pname; icon = pname;
terminal = "False"; terminal = "false";
comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
type = "Application"; type = "Application";
categories = "Game;RolePlaying;"; categories = "Game;RolePlaying;";

View file

@ -1,17 +1,17 @@
{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, { stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng,
cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }: cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf, imagemagick }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.22"; version = "0.9.24";
pname = "tuxpaint"; pname = "tuxpaint";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7";
}; };
nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo
librsvg gettext libpaper fribidi pkgconfig gperf ]; librsvg gettext libpaper fribidi pkgconfig gperf imagemagick ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
makeFlags = [ "GPERF=${gperf}/bin/gperf" makeFlags = [ "GPERF=${gperf}/bin/gperf"
"PREFIX=$$out" "PREFIX=$$out"

View file

@ -199,6 +199,11 @@ python2Packages.buildPythonApplication {
done done
''; '';
# There are some binaries there, which reference gcc-unwrapped otherwise.
stripDebugList = [
"share/hplip"
];
postFixup = '' postFixup = ''
substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
# Patch udev rules: # Patch udev rules:

View file

@ -4,6 +4,8 @@
, dbus, file, ghostscript, usbutils , dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools , net-snmp, openssl, perl, nettools
, bash, coreutils, utillinux , bash, coreutils, utillinux
# To remove references to gcc-unwrapped
, removeReferencesTo
, withQt5 ? true , withQt5 ? true
, withPlugin ? false , withPlugin ? false
, withStaticPPDInstall ? false , withStaticPPDInstall ? false
@ -65,7 +67,7 @@ python3Packages.buildPythonApplication {
zlib zlib
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ];
pythonPath = with python3Packages; [ pythonPath = with python3Packages; [
dbus dbus
@ -216,8 +218,14 @@ python3Packages.buildPythonApplication {
--replace /usr/bin/nohup "" \ --replace /usr/bin/nohup "" \
--replace {,${utillinux}/bin/}logger \ --replace {,${utillinux}/bin/}logger \
--replace {/usr,$out}/bin --replace {/usr,$out}/bin
remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
''; '';
# There are some binaries there, which reference gcc-unwrapped otherwise.
stripDebugList = [
"share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Print, scan and fax HP drivers for Linux"; description = "Print, scan and fax HP drivers for Linux";
homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yabai"; pname = "yabai";
version = "3.0.2"; version = "3.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koekeishiya"; owner = "koekeishiya";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "16y719384f9bx8zwfsjk5v2nyjyf43m154idsfzxpx0bbl8w5bpj"; sha256 = "11hdssqi8j39ihflx0bwxrn2zkmpp3rb8za7wwgrq3jm8h3a76c6";
}; };
buildInputs = [ Carbon Cocoa ScriptingBridge ]; buildInputs = [ Carbon Cocoa ScriptingBridge ];

View file

@ -247,7 +247,6 @@ stdenv.mkDerivation rec {
"fwupd/ata.conf" "fwupd/ata.conf"
# "fwupd/daemon.conf" # already created by the module # "fwupd/daemon.conf" # already created by the module
"fwupd/redfish.conf" "fwupd/redfish.conf"
"fwupd/remotes.d/dell-esrt.conf"
"fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor.conf"
@ -262,6 +261,8 @@ stdenv.mkDerivation rec {
"pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem" "pki/fwupd-metadata/LVFS-CA.pem"
] ++ stdenv.lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
]; ];
# BlacklistPlugins key in fwupd/daemon.conf # BlacklistPlugins key in fwupd/daemon.conf

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"prefix=$(out)" "prefix=$(out)"
"STRIP=-s" "STRIP="
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,6 +1,6 @@
{ callPackage, ... }@args: { callPackage, ... }@args:
callPackage ./generic.nix args { callPackage ./generic.nix args {
version = "1.18.0"; version = "1.19.0";
sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; sha256 = "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4";
} }

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kapow"; pname = "kapow";
version = "0.5.3"; version = "0.5.4";
goPackagePath = "github.com/BBVA/kapow"; goPackagePath = "github.com/BBVA/kapow";
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "BBVA"; owner = "BBVA";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0m5b9lvg5d908d27khyx9p3567pap1b2mxl8fk7cxhb51r89jypj"; sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4";
}; };
vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy"; vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy";

View file

@ -1,19 +1,19 @@
{ stdenv, buildGoModule, fetchFromGitHub, olm }: { stdenv, buildGoModule, fetchFromGitHub, olm }:
buildGoModule { buildGoModule rec {
pname = "mautrix-whatsapp-unstable"; pname = "mautrix-whatsapp";
version = "2020-06-01"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tulir"; owner = "tulir";
repo = "mautrix-whatsapp"; repo = "mautrix-whatsapp";
rev = "f1b50a22f3c3d54dfb7df12bb607dee8638259d6"; rev = "v${version}";
sha256 = "1fy8wqjrjnlv60xj7i6dflkw9kx3i7c7mwgqjjkg6afmmhmwr559"; sha256 = "0cjgyn311zvpdsagyndkw89bvdrcli5kqznss8dsh05wrllxp3x4";
}; };
buildInputs = [ olm ]; buildInputs = [ olm ];
vendorSha256 = "01psqvxkf13had7gkg1cbzf2flac4a6ivlb7vfzw7s50vhwkb95d"; vendorSha256 = "0980p9x62iav6j1w36w2i8pqyv6amnx4ngrgylq2vkjlcgihl2i8";
overrideModAttrs = _: { overrideModAttrs = _: {
postBuild = '' postBuild = ''

View file

@ -3,7 +3,7 @@
, openssl, perl, sqlite, libjpeg, speex, pcre , openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, libsndfile, libtiff , ldns, libedit, yasm, which, libsndfile, libtiff
, curl, lua, libmysqlclient, postgresql, libopus, libctb, gsmlib , callPackage
, SystemConfiguration , SystemConfiguration
@ -13,9 +13,7 @@
let let
availableModules = import ./modules.nix { availableModules = callPackage ./modules.nix { };
inherit curl lua libmysqlclient postgresql libopus libctb gsmlib;
};
# the default list from v1.8.7, except with applications/mod_signalwire also disabled # the default list from v1.8.7, except with applications/mod_signalwire also disabled
defaultModules = mods: with mods; [ defaultModules = mods: with mods; [
@ -101,6 +99,14 @@ stdenv.mkDerivation rec {
patchShebangs libs/libvpx/build/make/rtcd.pl patchShebangs libs/libvpx/build/make/rtcd.pl
substituteInPlace libs/libvpx/build/make/configure.sh \ substituteInPlace libs/libvpx/build/make/configure.sh \
--replace AS=\''${AS} AS=yasm --replace AS=\''${AS} AS=yasm
# Disable advertisement banners
for f in src/include/cc.h libs/esl/src/include/cc.h; do
{
echo 'const char *cc = "";'
echo 'const char *cc_s = "";'
} > $f
done
''; '';
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];

View file

@ -1,8 +1,12 @@
{ libopus { libopus
, opusfile
, libopusenc
, libogg
, libctb , libctb
, gsmlib , gsmlib
, lua , lua
, curl , curl
, ffmpeg
, libmysqlclient , libmysqlclient
, postgresql , postgresql
}: }:
@ -17,7 +21,7 @@ in
{ {
applications = { applications = {
abstraction = mk "applications/mod_abstraction" []; abstraction = mk "applications/mod_abstraction" [];
av = mk "applications/mod_av" []; av = mk "applications/mod_av" [ ffmpeg ];
avmd = mk "applications/mod_avmd" []; avmd = mk "applications/mod_avmd" [];
bert = mk "applications/mod_bert" []; bert = mk "applications/mod_bert" [];
blacklist = mk "applications/mod_blacklist" []; blacklist = mk "applications/mod_blacklist" [];
@ -161,6 +165,7 @@ in
imagick = mk "formats/mod_imagick" []; imagick = mk "formats/mod_imagick" [];
local_stream = mk "formats/mod_local_stream" []; local_stream = mk "formats/mod_local_stream" [];
native_file = mk "formats/mod_native_file" []; native_file = mk "formats/mod_native_file" [];
opusfile = mk "formats/mod_opusfile" [ libopus opusfile libopusenc libogg ];
png = mk "formats/mod_png" []; png = mk "formats/mod_png" [];
portaudio_stream = mk "formats/mod_portaudio_stream" []; portaudio_stream = mk "formats/mod_portaudio_stream" [];
shell_stream = mk "formats/mod_shell_stream" []; shell_stream = mk "formats/mod_shell_stream" [];
@ -169,6 +174,7 @@ in
ssml = mk "formats/mod_ssml" []; ssml = mk "formats/mod_ssml" [];
tone_stream = mk "formats/mod_tone_stream" []; tone_stream = mk "formats/mod_tone_stream" [];
vlc = mk "formats/mod_vlc" []; vlc = mk "formats/mod_vlc" [];
webm = mk "formats/mod_webm" [];
}; };
languages = { languages = {

View file

@ -2,16 +2,15 @@
buildGoPackage rec { buildGoPackage rec {
pname = "tegola"; pname = "tegola";
version = "0.8.1"; version = "0.11.2";
rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1";
goPackagePath = "github.com/go-spatial/tegola"; goPackagePath = "github.com/go-spatial/tegola";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "go-spatial"; owner = "go-spatial";
repo = "tegola"; repo = pname;
inherit rev; rev = "v${version}";
sha256 = "1f70vsrj3i1d0kg76a8s741nps71hrglgyyrz2xm6a8b31w833pi"; sha256 = "0xrjs0py08q9i31rl0cxi6idncrrgqwcspqks3c5vd9i65yqc6fv";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
doInstallCheck = true; doInstallCheck = true;
installCheck = '' installCheckPhase = ''
$out/bin/pwsh --help > /dev/null $out/bin/pwsh --help > /dev/null
''; '';

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "clair"; pname = "clair";
version = "2.1.3"; version = "2.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quay"; owner = "quay";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0wkljfq9lnadzkg1ki3wkimlqd6j405nxcl35npzrxjglkvsdjym"; sha256 = "1bvwh3ghxb3ynq8a07ka9i0rzaqg1aikxvqxmpjkwjvhwk63lwqd";
}; };
vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a";

View file

@ -10,13 +10,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "lxd"; pname = "lxd";
version = "4.1"; version = "4.2";
goPackagePath = "github.com/lxc/lxd"; goPackagePath = "github.com/lxc/lxd";
src = fetchurl { src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; sha256 = "0pv84ywnigrp94kh54fz689i15yv01lhrnkxpk8dg9wypxara9m4";
}; };
postPatch = '' postPatch = ''

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "monolith"; pname = "monolith";
version = "2.2.6"; version = "2.2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Y2Z"; owner = "Y2Z";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0ifv1h16xrs40gw5wx7kwj7hirnzpgfrznskz2igsslk7ycjlbr1"; sha256 = "1ww5q7pk269l2s7d2svkkyd7hb7g4hqmwjn09b287pmjcirnmqn9";
}; };
cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; cargoSha256 = "0jdbxshvm9hdxdjr3sy1kgszhfs9v4r6gp0nwvv2n92m3z8zri9y";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]

View file

@ -2,19 +2,21 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "hactool"; pname = "hactool";
version = "1.3.3"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SciresM"; owner = "SciresM";
repo = "hactool"; repo = "hactool";
rev = "1.3.3"; rev = "1.4.0";
sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631"; sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d";
}; };
preBuild = '' preBuild = ''
mv config.mk.template config.mk mv config.mk.template config.mk
''; '';
makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
installPhase = '' installPhase = ''
install -D hactool $out/bin/hactool install -D hactool $out/bin/hactool
''; '';

View file

@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "sharkdp"; owner = "sharkdp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1pjdvhldmjpy8ymb7r91y18hj5dx1iygszsfwkd66v9rncjigd07"; sha256 = "0pjdba2c6p7ldgx2yfffxqlpasrcfrlkw63m1ma34zdq0f287w3p";
fetchSubmodules = true;
}; };
cargoSha256 = "0myz06hjv4hwzmyqa9l36i9j9d213a0mnq8rvx6wyff7mr9zk99i"; cargoSha256 = "0myz06hjv4hwzmyqa9l36i9j9d213a0mnq8rvx6wyff7mr9zk99i";

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dua"; pname = "dua";
version = "2.6.0"; version = "2.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Byron"; owner = "Byron";
repo = "dua-cli"; repo = "dua-cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg"; sha256 = "0wq6cqznbpkiy9vz3slpcnxlsxff6gx5x7fsbd67q6jv5zhkn881";
# Remove unicode file names which leads to different checksums on HFS+ # Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation. # vs. other filesystems because of unicode normalisation.
extraPostFetch = '' extraPostFetch = ''
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
''; '';
}; };
cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b"; cargoSha256 = "096c6i1hqyygaifnm2kg53x22a8hhfxfz22qlssh1rw79bj82q0x";
doCheck = false; doCheck = false;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "mutagen"; pname = "mutagen";
version = "0.11.4"; version = "0.11.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mutagen-io"; owner = "mutagen-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "15bknyk6mkrwlm18ypncsf9az8l1nv67n0lf0zav867z0r46cc6x"; sha256 = "0z2bf412zfap91ygp7v06vif87d1cxj2jlc0jvfv7fm61801piij";
}; };
vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "pgmetrics"; pname = "pgmetrics";
version = "1.9.0"; version = "1.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapidloop"; owner = "rapidloop";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; sha256 = "03c4v24ql9p38m0hmgq5ya9cnvhmdhv2zjxxrxpb2338cxajs4mh";
}; };
vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";

View file

@ -5,13 +5,13 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rmlint"; pname = "rmlint";
version = "2.9.0"; version = "2.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sahib"; owner = "sahib";
repo = "rmlint"; repo = "rmlint";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i"; sha256 = "1r7j1bmm83p6wdw0jhvkm4sa568r534zsy45bvas7qq4433jl019";
}; };
CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; CFLAGS="-I${stdenv.lib.getDev utillinux}/include";

View file

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that # The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported # downloads break constantly. Because of that, updates should always be backported
# to the latest stable release. # to the latest stable release.
version = "2020.05.29"; version = "2020.06.06";
src = fetchurl { src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3"; sha256 = "1qrrr14glv0jv377n61paq55b6k58jpnwbz2sp5xfl4wnxy5hqny";
}; };
nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeBuildInputs = [ installShellFiles makeWrapper ];

View file

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "corerad"; pname = "corerad";
version = "0.2.5"; version = "0.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mdlayher"; owner = "mdlayher";
repo = "corerad"; repo = "corerad";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fi9wgv5aj3ds3r5qjyi4pxnd56psrpdy2sz84jd0sz2w48x4k4p"; sha256 = "16rwydvqkzi0jlgwpl3d4f8zd35y4lv4h5xa30ybqmwwp1k5ymf0";
}; };
vendorSha256 = "11r3vpimhik7y09gwb3p6pl0yf53hpaw24ry4a833fw8060rqp3q"; vendorSha256 = "1431fvi9b0id3zhgkxhiampc5avvp998lncyd5l2gn5py3qz6sdl";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
-X github.com/mdlayher/corerad/internal/build.linkTimestamp=1590182656 -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1591474872
-X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version}
''; '';

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dnsproxy"; pname = "dnsproxy";
version = "0.28.1"; version = "0.29.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdguardTeam"; owner = "AdguardTeam";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1pa4skrhdcblqs8r1kik5g8h9p6pcin5pd7b1dh7xk2n86xs8j22"; sha256 = "164l97x1g20a61jkb2dwwmf63md3np9x2m59dri3qf22k4rl4l0d";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mu"; pname = "mu";
version = "1.4.7"; version = "1.4.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djcb"; owner = "djcb";
repo = "mu"; repo = "mu";
rev = version; rev = version;
sha256 = "0inn720prhgxxc1napzd3xyzqgsvv70gqddsyzaa84h6946iz6v5"; sha256 = "1l8c72f3yd2vypc11frsmjnkr87h1q4gb6k3armpypwv6a6zl8z4";
}; };
postPatch = stdenv.lib.optionalString (batchSize != null) '' postPatch = stdenv.lib.optionalString (batchSize != null) ''
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
description = "A collection of utilties for indexing and searching Maildirs"; description = "A collection of utilties for indexing and searching Maildirs";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
homepage = "https://www.djcbsoftware.nl/code/mu/"; homepage = "https://www.djcbsoftware.nl/code/mu/";
changelog = "https://github.com/djcb/mu/releases/tag/${version}";
maintainers = with maintainers; [ antono peterhoeg ]; maintainers = with maintainers; [ antono peterhoeg ];
platforms = platforms.mesaPlatforms; platforms = platforms.mesaPlatforms;
}; };

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust"; pname = "shadowsocks-rust";
version = "1.8.11"; version = "1.8.12";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "shadowsocks"; owner = "shadowsocks";
repo = pname; repo = pname;
sha256 = "0imnvx3v0msk9qf72zy1qg5q52dmc8xfs9iwdwa2q13scjslgmwn"; sha256 = "0c9mdy22pjnjq5l2ji2whrfz64azx6yi6m76j17pbhnjf6f4jx9b";
}; };
cargoSha256 = "1aqqx0pdq3vp5c06pjwsrbrqfkz5dhxnpvv3vnr3pqfm62xrffgg"; cargoSha256 = "03gf26d7rz4v2v5fypcp5icsqqnb4m5dwil9ad5a98q3ssx80iwq";
SODIUM_USE_PKG_CONFIG = 1; SODIUM_USE_PKG_CONFIG = 1;

View file

@ -0,0 +1,45 @@
{ lib
, mkDerivation
, makeWrapper
, fetchFromGitHub
, cmake
, extra-cmake-modules
, qtbase
, qtquickcontrols2
, qtdeclarative
, qtgraphicaleffects
, kirigami2
, oathToolkit
}:
mkDerivation rec {
pname = "keysmith";
version = "0.1";
src = fetchFromGitHub {
owner = "KDE";
repo = "keysmith";
rev = "v${version}";
sha256 = "15fzf0bvarivm32zqa5w71mscpxdac64ykiawc5hx6kplz93bsgx";
};
nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
buildInputs = [ oathToolkit kirigami2 qtquickcontrols2 qtbase ];
postInstall = ''
mv $out/bin/org.kde.keysmith $out/bin/.org.kde.keysmith-wrapped
makeWrapper $out/bin/.org.kde.keysmith-wrapped $out/bin/org.kde.keysmith \
--set QML2_IMPORT_PATH "${lib.getLib kirigami2}/lib/qt-5.12.7/qml:${lib.getBin qtquickcontrols2}/lib/qt-5.12.7/qml:${lib.getBin qtdeclarative}/lib/qt-5.12.7/qml:${qtgraphicaleffects}/lib/qt-5.12.7/qml" \
--set QT_PLUGIN_PATH "${lib.getBin qtbase}/lib/qt-5.12.7/plugins"
ln -s $out/bin/org.kde.keysmith $out/bin/keysmith
'';
meta = with lib; {
description = "OTP client for Plasma Mobile and Desktop";
license = licenses.gpl3;
homepage = "https://github.com/KDE/keysmith";
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

Some files were not shown because too many files have changed in this diff Show more